aboutsummaryrefslogtreecommitdiff
path: root/src/wallet
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2017-11-14 22:40:04 +0200
committerRiccardo Spagni <ric@spagni.net>2017-11-14 22:40:04 +0200
commite35162b36690b4f73d65a07cacd9f2ef4a5d3f61 (patch)
treea2c076b13eb186716ca86737d85ba8969940a023 /src/wallet
parentMerge pull request #2789 (diff)
parentFix 383ff4f68943c5d998fba8caa20aee481583f214 (diff)
downloadmonero-e35162b36690b4f73d65a07cacd9f2ef4a5d3f61.tar.xz
Merge pull request #2813
29cee4ec Fix 383ff4f68943c5d998fba8caa20aee481583f214 (Howard Chu) b85e82bf Fix e89994e98f85be95d68c7bf471fcadf9aabbc93a (Howard Chu) 95e784ad Fix 437421ce42f1deaa7ec3f28c0c17aff519f1230d (Howard Chu)
Diffstat (limited to 'src/wallet')
-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 f6361ee37..c6db45dc9 100644
--- a/src/wallet/wallet2.cpp
+++ b/src/wallet/wallet2.cpp
@@ -296,7 +296,7 @@ std::unique_ptr<tools::wallet2> generate_from_json(const std::string& json_file,
// compatibility checks
if (!field_seed_found && !field_viewkey_found && !field_spendkey_found)
{
- THROW_WALLET_EXCEPTION(tools::wallet2::tr("At least one of Electrum-style word list and private view key and private spend key must be specified"));
+ THROW_WALLET_EXCEPTION(tools::error::wallet_internal_error, tools::wallet2::tr("At least one of Electrum-style word list and private view key and private spend key must be specified"));
}
if (field_seed_found && (field_viewkey_found || field_spendkey_found))
{