aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2019-04-01 17:21:14 +0200
committerRiccardo Spagni <ric@spagni.net>2019-04-01 17:21:14 +0200
commita6b798e72fa928744c7c787e42b50bf1efea0157 (patch)
treedd483b64136c43e62fda2d058adb993096c52053 /src
parent574c399386f95f61d9e0fb3e929eaab85203c315 (diff)
parenta52366c1bfe783f8c2089afc3dac24a6a71325a4 (diff)
downloadmonzero-core-a6b798e72fa928744c7c787e42b50bf1efea0157.tar.gz
monzero-core-a6b798e72fa928744c7c787e42b50bf1efea0157.tar.xz
monzero-core-a6b798e72fa928744c7c787e42b50bf1efea0157.zip
Merge pull request #5291
a52366c1 wallet2: fix generation from json when restore height is not set (moneromooo-monero)
Diffstat (limited to 'src')
-rw-r--r--src/wallet/wallet2.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp
index 9ba5f9946..5ae32385f 100644
--- a/src/wallet/wallet2.cpp
+++ b/src/wallet/wallet2.cpp
@@ -512,7 +512,7 @@ std::pair<std::unique_ptr<tools::wallet2>, tools::password_container> generate_f
GET_FIELD_FROM_JSON_RETURN_ON_ERROR(json, filename, std::string, String, true, std::string());
GET_FIELD_FROM_JSON_RETURN_ON_ERROR(json, scan_from_height, uint64_t, Uint64, false, 0);
- const bool recover = field_scan_from_height_found;
+ const bool recover = true;
GET_FIELD_FROM_JSON_RETURN_ON_ERROR(json, password, std::string, String, false, std::string());