diff options
| author | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2018-10-01 11:18:50 +0000 |
|---|---|---|
| committer | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2018-10-01 12:32:26 +0000 |
| commit | 25e5890d37a1b243d4b8aadb45743d715bd4d0f9 (patch) | |
| tree | 2cb9f5543d11a7f7e18145cb0dcf15f209c38c73 /src/wallet/wallet_rpc_server.cpp | |
| parent | Merge pull request #4333 (diff) | |
| download | monero-25e5890d37a1b243d4b8aadb45743d715bd4d0f9.tar.xz | |
wallet: fix --generate-from-json using wrong password
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 5991e0cc2..8b15359cc 100644 --- a/src/wallet/wallet_rpc_server.cpp +++ b/src/wallet/wallet_rpc_server.cpp @@ -3352,7 +3352,8 @@ public: { try { - wal = tools::wallet2::make_from_json(vm, true, from_json, password_prompt); + auto rc = tools::wallet2::make_from_json(vm, true, from_json, password_prompt); + wal = std::move(rc.first); } catch (const std::exception &e) { |