From 03af06718cd4ba0185a937f2ef04837963f7ac33 Mon Sep 17 00:00:00 2001 From: Jaquee Date: Wed, 21 Jun 2017 17:08:57 +0200 Subject: [PATCH 1/2] Disabled update check requires #2101 --- empty | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 empty diff --git a/empty b/empty new file mode 100644 index 00000000..e69de29b From c65ee4e71c63a447e8e89a7737ae82bf76fc1a77 Mon Sep 17 00:00:00 2001 From: Jaquee Date: Thu, 22 Jun 2017 12:22:04 +0200 Subject: [PATCH 2/2] fix windows crash on startup requires #2101 --- MiddlePanel.qml | 7 ++++--- main.cpp | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/MiddlePanel.qml b/MiddlePanel.qml index 1646f9e1..b51b391d 100644 --- a/MiddlePanel.qml +++ b/MiddlePanel.qml @@ -29,7 +29,7 @@ import QtQml 2.0 import QtQuick 2.2 -import QtQuick.Controls 2.0 +//import QtQuick.Controls 2.0 import QtQuick.Controls 1.4 import QtQuick.Layouts 1.1 import QtGraphicalEffects 1.0 @@ -187,8 +187,9 @@ Rectangle { Layout.fillWidth: true Layout.fillHeight: true clip: true - ScrollIndicator.vertical: ScrollIndicator { } - ScrollBar.vertical: ScrollBar { } // uncomment to test + // Disabled scrollbars, gives crash on startup on windows +// ScrollIndicator.vertical: ScrollIndicator { } +// ScrollBar.vertical: ScrollBar { } // uncomment to test // Views container StackView { diff --git a/main.cpp b/main.cpp index ee9f0ece..1a9a979d 100644 --- a/main.cpp +++ b/main.cpp @@ -76,7 +76,7 @@ int main(int argc, char *argv[]) // Log settings Monero::Wallet::init(argv[0], "monero-wallet-gui"); - qInstallMessageHandler(messageHandler); +// qInstallMessageHandler(messageHandler); MainApp app(argc, argv);