Fix windows crash

ZcashFoundation · Oct 22, 2018 · 972140e · 972140e
1 parent 7128ad1
commit 972140e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
@@ -291,8 +291,8 @@ std::function<void(bool)> MainWindow::addZAddrsToComboList(bool sapling) {
             ui->listRecieveAddresses->clear();
 
             std::for_each(addrs->begin(), addrs->end(), [=] (auto addr) {
-                if ( (sapling &&  settings->isSaplingAddress(addr)) ||
-                    (!sapling && !settings->isSaplingAddress(addr)))
+                if ( (sapling &&  Settings::getInstance()->isSaplingAddress(addr)) ||
+                    (!sapling && !Settings::getInstance()->isSaplingAddress(addr)))
                     ui->listRecieveAddresses->addItem(addr);
             }); 
 

diff --git a/src/mainwindow.h b/src/mainwindow.h
@@ -78,7 +78,6 @@ class MainWindow : public QMainWindow
     void importPrivKeys();
 
     RPC*                rpc;
-    Settings*           settings;
 
     QMovie*             loadingMovie;
 };

diff --git a/src/scripts/mkwinrelease.ps1 b/src/scripts/mkwinrelease.ps1
@@ -20,7 +20,7 @@ Move-Item release/zcash-qt-wallet.exe release/$target | Out-Null
 
 echo "Copying"
 # No need for deploy, since we're using a static Qt5 library
-# & "$Env:QT_STATIC\bin\windeployqt.exe" release/$target/zcash-qt-wallet.exe *>$null
+& "$Env:QT_STATIC\bin\windeployqt.exe" release/$target/zcash-qt-wallet.exe *>$null
 Copy-Item LICENSE release/$target | Out-Null
 Copy-Item README.md release/$target | Out-Null