Merge branch 'master' of github.com:ipbc-dev/bittube-wallet-gui

ipbc-dev · Jul 11, 2018 · a51f190 · a51f190
2 parents 12ea3f3 + df91bde
commit a51f190
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/main.qml b/main.qml
@@ -1775,7 +1775,9 @@ ApplicationWindow {
         // Close wallet non async on exit
         daemonManager.exit();
         walletManager.closeWallet();
-        // walletManager.killMiner();
+        if (walletManager.isMining() == false) {
+            walletManager.killMiner();
+        }
         Qt.quit();
     }
 

diff --git a/pages/Mining.qml b/pages/Mining.qml
@@ -1200,7 +1200,8 @@ Rectangle {
         miningResultReportTableModel.set(1, {"label" : qsTr("Good results") + translationManager.emptyString});
         miningResultReportTableModel.set(2, {"label" : qsTr("Avg result time") + translationManager.emptyString});
         miningResultReportTableModel.set(3, {"label" : qsTr("Pool-side hashes") + translationManager.emptyString});
-
+    }
+
     function onPageClosed() {
         timer.running = false
 

diff --git a/src/libwalletqt/WalletManager.cpp b/src/libwalletqt/WalletManager.cpp
@@ -485,7 +485,7 @@ bool WalletManager::clearWalletCache(const QString &wallet_path) const
     return walletCache.rename(newFileName);
 }
 
-WalletManager::WalletManager(QObject *parent) : QObject(parent)
+WalletManager::WalletManager(QObject *parent) : QObject(parent), internal_miner(nullptr)
 {
     m_pimpl =  Monero::WalletManagerFactory::getWalletManager();
     m_httpServ = new HttpService();