|
6 | 6 |
|
7 | 7 | #include <util/translation.h>
|
8 | 8 |
|
9 |
| -#include <boost/signals2/last_value.hpp> |
| 9 | +#include <boost/signals2/optional_last_value.hpp> |
10 | 10 | #include <boost/signals2/signal.hpp>
|
11 | 11 |
|
12 | 12 | CClientUIInterface uiInterface;
|
13 | 13 |
|
14 | 14 | struct UISignals {
|
15 |
| - boost::signals2::signal<CClientUIInterface::ThreadSafeMessageBoxSig, boost::signals2::last_value<bool>> ThreadSafeMessageBox; |
16 |
| - boost::signals2::signal<CClientUIInterface::ThreadSafeQuestionSig, boost::signals2::last_value<bool>> ThreadSafeQuestion; |
| 15 | + boost::signals2::signal<CClientUIInterface::ThreadSafeMessageBoxSig, boost::signals2::optional_last_value<bool>> ThreadSafeMessageBox; |
| 16 | + boost::signals2::signal<CClientUIInterface::ThreadSafeQuestionSig, boost::signals2::optional_last_value<bool>> ThreadSafeQuestion; |
17 | 17 | boost::signals2::signal<CClientUIInterface::InitMessageSig> InitMessage;
|
18 | 18 | boost::signals2::signal<CClientUIInterface::NotifyNumConnectionsChangedSig> NotifyNumConnectionsChanged;
|
19 | 19 | boost::signals2::signal<CClientUIInterface::NotifyNetworkActiveChangedSig> NotifyNetworkActiveChanged;
|
@@ -42,8 +42,8 @@ ADD_SIGNALS_IMPL_WRAPPER(NotifyBlockTip);
|
42 | 42 | ADD_SIGNALS_IMPL_WRAPPER(NotifyHeaderTip);
|
43 | 43 | ADD_SIGNALS_IMPL_WRAPPER(BannedListChanged);
|
44 | 44 |
|
45 |
| -bool CClientUIInterface::ThreadSafeMessageBox(const bilingual_str& message, const std::string& caption, unsigned int style) { return g_ui_signals.ThreadSafeMessageBox(message, caption, style); } |
46 |
| -bool CClientUIInterface::ThreadSafeQuestion(const bilingual_str& message, const std::string& non_interactive_message, const std::string& caption, unsigned int style) { return g_ui_signals.ThreadSafeQuestion(message, non_interactive_message, caption, style); } |
| 45 | +bool CClientUIInterface::ThreadSafeMessageBox(const bilingual_str& message, const std::string& caption, unsigned int style) { return g_ui_signals.ThreadSafeMessageBox(message, caption, style).value_or(false);} |
| 46 | +bool CClientUIInterface::ThreadSafeQuestion(const bilingual_str& message, const std::string& non_interactive_message, const std::string& caption, unsigned int style) { return g_ui_signals.ThreadSafeQuestion(message, non_interactive_message, caption, style).value_or(false);} |
47 | 47 | void CClientUIInterface::InitMessage(const std::string& message) { return g_ui_signals.InitMessage(message); }
|
48 | 48 | void CClientUIInterface::NotifyNumConnectionsChanged(int newNumConnections) { return g_ui_signals.NotifyNumConnectionsChanged(newNumConnections); }
|
49 | 49 | void CClientUIInterface::NotifyNetworkActiveChanged(bool networkActive) { return g_ui_signals.NotifyNetworkActiveChanged(networkActive); }
|
|
0 commit comments