Merge pull request #777

c65ee4e fix windows crash on startup requires #2101 (Jaquee)
03af067 Disabled update check requires #2101 (Jaquee)

3 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/empty b/empty
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/empty
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);