wip

diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
index 77c96f5796fe0c15fe847eebc8a6f9cc114b176e..3142dce9643c29c9686b953079970c28c08cc153 100644 (file)
--- a/src/MainWindow.cpp
+++ b/src/MainWindow.cpp
@@ -615,7 +615,7 @@ void MainWindow::initOffline() {
         }
         
         // Trigger the refresh (sets m_refreshNow = true, bypassing the pause check)
-        m_wallet->startRefresh();
+        m_wallet->startRefresh(true);
     });
 
 

diff --git a/src/libwalletqt/Wallet.cpp b/src/libwalletqt/Wallet.cpp
index 64f6057d79d2f32c6638c2611b4383c0db75b85b..b479fd748565e6408ef158535033bddcc6fd6385 100644 (file)
--- a/src/libwalletqt/Wallet.cpp
+++ b/src/libwalletqt/Wallet.cpp
@@ -482,10 +482,12 @@ void Wallet::initAsync(const QString &daemonAddress, bool trustedDaemon, quint64
 
 // #################### Synchronization (Refresh) ####################
 
-void Wallet::startRefresh() {
+void Wallet::startRefresh(bool force) {
     startRefreshThread();
     m_refreshEnabled = true;
-    m_refreshNow = true;
+    if (force || !m_syncPaused) {
+        m_refreshNow = true;
+    }
 }
 
 void Wallet::pauseRefresh() {
@@ -697,9 +699,8 @@ void Wallet::setSyncPaused(bool paused) {
     if (paused) {
         pauseRefresh();
     } else {
-        m_refreshNow = true;
         m_wallet2->set_offline(false);
-        startRefresh();
+        startRefresh(true);
     }
 }
 
@@ -727,7 +728,7 @@ void Wallet::skipToTip() {
     m_lastSyncTime = QDateTime::currentDateTime();
 
     setConnectionStatus(ConnectionStatus_Synchronized);
-    startRefresh();
+    startRefresh(true);
     emit syncStatus(target, target, true);
 }
 
@@ -753,7 +754,7 @@ void Wallet::syncDateRange(const QDate &start, const QDate &end) {
         m_wallet2->set_refresh_from_block_height(startHeight);
     }
     setConnectionStatus(ConnectionStatus_Synchronizing);
-    startRefresh();
+    startRefresh(true);
 }
 
 
@@ -784,7 +785,7 @@ void Wallet::fullSync() {
     }
     // Trigger rescan
     setConnectionStatus(ConnectionStatus_Synchronizing);
-    startRefresh();
+    startRefresh(true);
 
     qInfo() << "Full Sync triggered. Rescanning from original restore height:" << originalHeight;
 }

diff --git a/src/libwalletqt/Wallet.h b/src/libwalletqt/Wallet.h
index 577d06205758282e0803adaad78f846c5240a171..4da2a85fde5a5d019d5eab58aeb963a531d11bfa 100644 (file)
--- a/src/libwalletqt/Wallet.h
+++ b/src/libwalletqt/Wallet.h
@@ -221,7 +221,7 @@ public:
                    const QString &proxyAddress = "");
 
     // ##### Synchronization (Refresh) #####
-    void startRefresh();
+    void startRefresh(bool force = false);
     void pauseRefresh();
     Q_INVOKABLE void updateNetworkStatus();