aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorluigi1111 <luigi1111w@gmail.com>2019-11-16 11:03:05 -0600
committerluigi1111 <luigi1111w@gmail.com>2019-11-16 11:03:05 -0600
commitf07c326f13dc25efcfe6d680623c8cacb2dea2db (patch)
tree843139b278712d038d4b76dca7f1a3253402b808
parentMerge pull request #6121 (diff)
parentwallet: set non-empty error string on connection failure (diff)
downloadmonero-f07c326f13dc25efcfe6d680623c8cacb2dea2db.tar.xz
Merge pull request #6138
2a8953c wallet: set non-empty error string on connection failure (xiphon)
-rw-r--r--src/wallet/node_rpc_proxy.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/wallet/node_rpc_proxy.cpp b/src/wallet/node_rpc_proxy.cpp
index 15ea26044..005b0bafa 100644
--- a/src/wallet/node_rpc_proxy.cpp
+++ b/src/wallet/node_rpc_proxy.cpp
@@ -36,7 +36,7 @@
do { \
CHECK_AND_ASSERT_MES(error.code == 0, error.message, error.message); \
handle_payment_changes(res, std::integral_constant<bool, HasCredits<decltype(res)>::Has>()); \
- CHECK_AND_ASSERT_MES(r, std::string(), "Failed to connect to daemon"); \
+ CHECK_AND_ASSERT_MES(r, std::string("Failed to connect to daemon"), "Failed to connect to daemon"); \
/* empty string -> not connection */ \
CHECK_AND_ASSERT_MES(!res.status.empty(), res.status, "No connection to daemon"); \
CHECK_AND_ASSERT_MES(res.status != CORE_RPC_STATUS_BUSY, res.status, "Daemon busy"); \