diff options
| author | Riccardo Spagni <ric@spagni.net> | 2018-12-04 17:33:18 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2018-12-04 17:33:19 +0200 |
| commit | 81418cb281c44481fc4137257df8e39623d94885 (patch) | |
| tree | 1e1ac74513bb5128de98949eb4a15bfb61997c53 /src/wallet/wallet_rpc_server.cpp | |
| parent | 6d1c2a93044144d88d5984c425ae29ca3c6cb2aa (diff) | |
| parent | aee7a4e3642e384c05d9721deb449b39f91857eb (diff) | |
| download | monzero-core-81418cb281c44481fc4137257df8e39623d94885.tar.gz monzero-core-81418cb281c44481fc4137257df8e39623d94885.tar.xz monzero-core-81418cb281c44481fc4137257df8e39623d94885.zip | |
Merge pull request #4894
aee7a4e3 wallet_rpc_server: do not use RPC data if the call failed (moneromooo-monero)
1a0733e5 windows_service: fix memory leak (moneromooo-monero)
0dac3c64 unit_tests: do not rethrow a copy of an exception (moneromooo-monero)
5d9915ab cryptonote: fix get_unit for non default settings (moneromooo-monero)
d4f50cb1 remove some unused code (moneromooo-monero)
61163971 a few minor (but easy) performance tweaks (moneromooo-monero)
30023074 tests: slow_memmem now returns size_t (moneromooo-monero)
Diffstat (limited to 'src/wallet/wallet_rpc_server.cpp')
| -rw-r--r-- | src/wallet/wallet_rpc_server.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/wallet/wallet_rpc_server.cpp b/src/wallet/wallet_rpc_server.cpp index 0eb09b9f1..d7dc2914e 100644 --- a/src/wallet/wallet_rpc_server.cpp +++ b/src/wallet/wallet_rpc_server.cpp @@ -2891,7 +2891,8 @@ namespace tools cryptonote::COMMAND_RPC_GET_HEIGHT::response hres; hres.height = 0; bool r = wal->invoke_http_json("/getheight", hreq, hres); - wal->set_refresh_from_block_height(hres.height); + if (r) + wal->set_refresh_from_block_height(hres.height); crypto::secret_key dummy_key; try { wal->generate(wallet_file, req.password, dummy_key, false, false); |