diff options
| author | Riccardo Spagni <ric@spagni.net> | 2015-12-30 12:28:03 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2015-12-30 12:28:03 +0200 |
| commit | 7223eebbe71833e895fca95267cb243834dedf83 (patch) | |
| tree | a5d48783316ff837e353c51a29b54f5324dd0bb1 /src/wallet | |
| parent | Merge pull request #575 (diff) | |
| parent | no longer need to pass the size to rapidjson (diff) | |
| download | monero-7223eebbe71833e895fca95267cb243834dedf83.tar.xz | |
Merge pull request #577
32a2633 no longer need to pass the size to rapidjson (Riccardo Spagni)
bd8e0fd add missing miniupnpc files, modify cmake to not build miniupnpc tests and to fix an issue with finding miniupnpcstrings (Riccardo Spagni)
7da9905 updated miniupnpc (Riccardo Spagni)
Diffstat (limited to 'src/wallet')
| -rw-r--r-- | src/wallet/wallet2.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp index 123637a6f..cfa33b283 100644 --- a/src/wallet/wallet2.cpp +++ b/src/wallet/wallet2.cpp @@ -894,7 +894,7 @@ void wallet2::load_keys(const std::string& keys_file_name, const std::string& pa // The contents should be JSON if the wallet follows the new format. rapidjson::Document json; - if (json.Parse(account_data.c_str(), keys_file_data.account_data.size()).HasParseError()) + if (json.Parse(account_data.c_str()).HasParseError()) { is_old_file_format = true; m_watch_only = false; @@ -972,7 +972,7 @@ bool wallet2::verify_password(const std::string& password) const // The contents should be JSON if the wallet follows the new format. rapidjson::Document json; - if (json.Parse(account_data.c_str(), keys_file_data.account_data.size()).HasParseError()) + if (json.Parse(account_data.c_str()).HasParseError()) { // old format before JSON wallet key file format } |