From: tobtoht Date: Sun, 6 Oct 2024 22:22:12 +0000 (+0200) Subject: windowmanager: properly exit app on close if wallet failed to open X-Git-Url: https://git.nutra.tk/v1?a=commitdiff_plain;h=ec8d3bff57ece855552db616b50c6715ccd9d2e2;p=gamesguru%2Ffeather.git windowmanager: properly exit app on close if wallet failed to open --- diff --git a/src/WindowManager.cpp b/src/WindowManager.cpp index a34eae9c..48b5de1f 100644 --- a/src/WindowManager.cpp +++ b/src/WindowManager.cpp @@ -284,6 +284,7 @@ void WindowManager::onWalletOpened(Wallet *wallet) { bool showIncorrectPassword = m_openWalletTriedOnce; m_openWalletTriedOnce = true; this->onWalletOpenPasswordRequired(showIncorrectPassword, wallet->keysPath()); + return; // Do not remove this } else if (errMsg == QString("basic_string::_M_replace_aux") || errMsg == QString("std::bad_alloc") || errMsg == "invalid signature") { qCritical() << errMsg; @@ -304,6 +305,8 @@ void WindowManager::onWalletOpened(Wallet *wallet) { this->handleDeviceError(errMsg, message); this->handleWalletError(message); } + + m_openingWallet = false; return; }