From 6a3b3fc830bfa3531ccb7d0f80aad8cbeb3e22b8 Mon Sep 17 00:00:00 2001
From: tobtoht <tob@featherwallet.org>
Date: Sat, 30 Dec 2023 12:43:10 +0100
Subject: [PATCH] lock: fix connection status

---
 src/MainWindow.cpp         | 4 +++-
 src/libwalletqt/Wallet.cpp | 5 ++++-
 src/libwalletqt/Wallet.h   | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
index b416a7c8..6e414995 100644
--- a/src/MainWindow.cpp
+++ b/src/MainWindow.cpp
@@ -667,7 +667,6 @@ void MainWindow::onProxySettingsChanged() {
 }
 
 void MainWindow::onOfflineMode(bool offline) {
-    this->onConnectionStatusChanged(Wallet::ConnectionStatus_Disconnected);
     m_wallet->setOffline(offline);
 
     if (m_wallet->viewOnly()) {
@@ -717,6 +716,9 @@ void MainWindow::onRefreshSync(int height, int target) {
 
 void MainWindow::onConnectionStatusChanged(int status)
 {
+    // Note: Wallet does not emit this signal unless status is changed, so calling this function from MainWindow may
+    // result in the wrong connection status being displayed.
+
     qDebug() << "Wallet connection status changed " << Utils::QtEnumToString(static_cast<Wallet::ConnectionStatus>(status));
 
     // Update connection info in status bar.
diff --git a/src/libwalletqt/Wallet.cpp b/src/libwalletqt/Wallet.cpp
index 77c39ed2..9bae3f29 100644
--- a/src/libwalletqt/Wallet.cpp
+++ b/src/libwalletqt/Wallet.cpp
@@ -274,8 +274,11 @@ void Wallet::setSeedLanguage(const QString &lang)
 
 // #################### Node connection ####################
 
-void Wallet::setOffline(bool offline) const {
+void Wallet::setOffline(bool offline) {
     m_wallet2->set_offline(offline);
+    if (offline) {
+        setConnectionStatus(Wallet::ConnectionStatus_Disconnected);
+    }
 }
 
 void Wallet::setTrustedDaemon(bool arg) {
diff --git a/src/libwalletqt/Wallet.h b/src/libwalletqt/Wallet.h
index 5321b916..be792d10 100644
--- a/src/libwalletqt/Wallet.h
+++ b/src/libwalletqt/Wallet.h
@@ -193,7 +193,7 @@ public:
 
     // ##### Node connection #####
 
-    void setOffline(bool offline) const;
+    void setOffline(bool offline);
 
     //! indicates if daemon is trusted
     void setTrustedDaemon(bool arg);
-- 
2.52.0