From 09e25c9b5ebd0cd87ca5bbff20d6400b950bda0f Mon Sep 17 00:00:00 2001 From: Aditya Kulkarni Date: Wed, 20 Mar 2019 10:40:09 -0700 Subject: [PATCH] Fix crash on receive tab --- src/mainwindow.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 1a365e0..017594c 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -1275,8 +1275,10 @@ std::function MainWindow::addZAddrsToComboList(bool sapling) { std::for_each(addrs->begin(), addrs->end(), [=] (auto addr) { if ( (sapling && Settings::getInstance()->isSaplingAddress(addr)) || (!sapling && !Settings::getInstance()->isSaplingAddress(addr))) { - auto bal = rpc->getAllBalances()->value(addr); - ui->listRecieveAddresses->addItem(addr, bal); + if (rpc->getAllBalances()) { + auto bal = rpc->getAllBalances()->value(addr); + ui->listRecieveAddresses->addItem(addr, bal); + } } }); @@ -1322,8 +1324,13 @@ void MainWindow::setupRecieveTab() { else { ui->btnRecieveNewAddr->setToolTip(""); } + addZAddrsToComboList(false)(checked); + + bool showWarning = checked && Settings::getInstance()->getZcashdVersion() < 2000450; + ui->lblSproutWarning->setVisible(showWarning); }); + QObject::connect(ui->rdioZSAddr, &QRadioButton::toggled, addZAddrsToComboList(true)); // Explicitly get new address button.