diff options
author | MarcoFalke <falke.marco@gmail.com> | 2019-10-06 17:52:05 -0400 |
---|---|---|
committer | MarcoFalke <falke.marco@gmail.com> | 2019-10-08 13:02:14 -0400 |
commit | facec1c643105d0ae74b5d32cf33d593f9e82a36 (patch) | |
tree | 70ddbd9cd41bb94a5667ec8ccc24c45b7ffe203f /src/qt/walletcontroller.cpp | |
parent | 94e6e9f38deeba61655fee432afe42e66ff72ea3 (diff) | |
download | bitcoin-facec1c643105d0ae74b5d32cf33d593f9e82a36.tar.xz |
wallet: Avoid showing GUI popups on RPC errors
Diffstat (limited to 'src/qt/walletcontroller.cpp')
-rw-r--r-- | src/qt/walletcontroller.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/qt/walletcontroller.cpp b/src/qt/walletcontroller.cpp index fa6f9f3f16..a7edf442e5 100644 --- a/src/qt/walletcontroller.cpp +++ b/src/qt/walletcontroller.cpp @@ -12,6 +12,7 @@ #include <interfaces/handler.h> #include <interfaces/node.h> +#include <util/string.h> #include <algorithm> @@ -226,7 +227,7 @@ void CreateWalletActivity::finish() if (!m_error_message.empty()) { QMessageBox::critical(m_parent_widget, tr("Create wallet failed"), QString::fromStdString(m_error_message)); } else if (!m_warning_message.empty()) { - QMessageBox::warning(m_parent_widget, tr("Create wallet warning"), QString::fromStdString(m_warning_message)); + QMessageBox::warning(m_parent_widget, tr("Create wallet warning"), QString::fromStdString(Join(m_warning_message, "\n"))); } if (m_wallet_model) Q_EMIT created(m_wallet_model); @@ -267,7 +268,7 @@ void OpenWalletActivity::finish() if (!m_error_message.empty()) { QMessageBox::critical(m_parent_widget, tr("Open wallet failed"), QString::fromStdString(m_error_message)); } else if (!m_warning_message.empty()) { - QMessageBox::warning(m_parent_widget, tr("Open wallet warning"), QString::fromStdString(m_warning_message)); + QMessageBox::warning(m_parent_widget, tr("Open wallet warning"), QString::fromStdString(Join(m_warning_message, "\n"))); } if (m_wallet_model) Q_EMIT opened(m_wallet_model); |