Merge pull request #6138

2a8953c wallet: set non-empty error string on connection failure (xiphon)
monero-project · Nov 16, 2019 · f07c326f13dc25efcfe6d680623c8cacb2dea2db · f07c326
2 parents 12e261e + 2a8953c
commit f07c326f13dc25efcfe6d680623c8cacb2dea2db
Unified Split

Showing with 1 addition and 1 deletion.

+1 −1 src/wallet/node_rpc_proxy.cpp
diff --git 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"); \