diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp --- a/src/qt/bitcoin.cpp +++ b/src/qt/bitcoin.cpp @@ -72,10 +72,6 @@ // Config is non-copyable so we can only register pointers to it Q_DECLARE_METATYPE(Config *) -static void InitMessage(const std::string &message) { - noui_InitMessage(message); -} - static QString GetLangTerritory() { QSettings settings; // Get desired locale (e.g. "de_DE") @@ -524,6 +520,14 @@ std::unique_ptr node = interfaces::MakeNode(); + // Subscribe to global signals from core + std::unique_ptr handler_message_box = + node->handleMessageBox(noui_ThreadSafeMessageBox); + std::unique_ptr handler_question = + node->handleQuestion(noui_ThreadSafeQuestion); + std::unique_ptr handler_init_message = + node->handleInitMessage(noui_InitMessage); + // Do not refer to data directory yet, this can be overridden by // Intro::pickDataDirectory @@ -701,10 +705,6 @@ // Load GUI settings from QSettings app.createOptionsModel(gArgs.GetBoolArg("-resetguisettings", false)); - // Subscribe to global signals from core - std::unique_ptr handler = - node->handleInitMessage(InitMessage); - // Get global config Config &config = const_cast(GetConfig()); diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp --- a/src/qt/bitcoingui.cpp +++ b/src/qt/bitcoingui.cpp @@ -13,7 +13,6 @@ #include #include #include -#include #include #include #include @@ -1377,9 +1376,6 @@ static bool ThreadSafeMessageBox(BitcoinGUI *gui, const std::string &message, const std::string &caption, unsigned int style) { - // Redundantly log and print message in non-gui fashion - noui_ThreadSafeMessageBox(message, caption, style); - bool modal = (style & CClientUIInterface::MODAL); // The SECURE flag has no effect in the Qt GUI. // bool secure = (style & CClientUIInterface::SECURE);