aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2018-03-16 18:08:52 +0200
committerRiccardo Spagni <ric@spagni.net>2018-03-16 18:08:52 +0200
commit2a9839cc3e2eebc95b8831309c92222a56616101 (patch)
treec4f9f9620e2f356ccbd4e7b32f8770ce6deb35d0
parentMerge pull request #3336 (diff)
parentshow '<Not set>' for empty wallet description (diff)
downloadmonero-2a9839cc3e2eebc95b8831309c92222a56616101.tar.xz
Merge pull request #3376
833f9fcf show '<Not set>' for empty wallet description (cryptochangements34)
-rw-r--r--src/simplewallet/simplewallet.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp
index bd1e424d4..6ac8fee9d 100644
--- a/src/simplewallet/simplewallet.cpp
+++ b/src/simplewallet/simplewallet.cpp
@@ -6802,9 +6802,13 @@ bool simple_wallet::wallet_info(const std::vector<std::string> &args)
{
bool ready;
uint32_t threshold, total;
-
+ std::string description = m_wallet->get_description();
+ if (description.empty())
+ {
+ description = "<Not set>";
+ }
message_writer() << tr("Filename: ") << m_wallet->get_wallet_file();
- message_writer() << tr("Description: ") << m_wallet->get_description();
+ message_writer() << tr("Description: ") << description;
message_writer() << tr("Address: ") << m_wallet->get_account().get_public_address_str(m_wallet->nettype());
std::string type;
if (m_wallet->watch_only())