From 972140e294ecf5d46904726d4fb28d52f15b5574 Mon Sep 17 00:00:00 2001
From: adityapk <adityapk@gmail.com>
Date: Mon, 22 Oct 2018 13:58:02 -0700
Subject: [PATCH] Fix windows crash

---
 src/mainwindow.cpp           | 4 ++--
 src/mainwindow.h             | 1 -
 src/scripts/mkwinrelease.ps1 | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 34a047b7..28fac818 100644
--- 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
index 70d94975..a0f29c2c 100644
--- 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
index 2d674960..0ef7b062 100644
--- 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