Merge pull request #4482

25e5890d wallet: fix --generate-from-json using wrong password (moneromooo-monero)
2018-10-02 22:39:56 +02:00
parent 9c426a30f9
commit e0fa7fa384
6 changed files with 20 additions and 7 deletions
@@ -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)
        {