Merge pull request #3376

833f9fcf show '<Not set>' for empty wallet description (cryptochangements34)
This commit is contained in:
Riccardo Spagni 2018-03-16 18:08:52 +02:00
commit 2a9839cc3e
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
1 changed files with 6 additions and 2 deletions

View File

@ -6802,9 +6802,13 @@ bool simple_wallet::wallet_info(const std::vector<std::string> &args)
{ {
bool ready; bool ready;
uint32_t threshold, total; 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("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()); message_writer() << tr("Address: ") << m_wallet->get_account().get_public_address_str(m_wallet->nettype());
std::string type; std::string type;
if (m_wallet->watch_only()) if (m_wallet->watch_only())