DragonX/SilentDragonXLite
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Prevent error dialog reentry

Browse Source
This commit is contained in:
adityapk00
2018-11-23 11:10:16 -08:00
parent ba080c1ce4
commit d71d08cd88
3 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/addresscombo.cpp
View File

@@ -4,7 +4,6 @@
AddressCombo::AddressCombo(QWidget* parent) : AddressCombo::AddressCombo(QWidget* parent) :
QComboBox(parent) { QComboBox(parent) {
} }
QString AddressCombo::itemText(int i) { QString AddressCombo::itemText(int i) {

7
src/connection.cpp
View File

@@ -657,8 +657,15 @@ void Connection::doRPCIgnoreError(const json& payload, const std::function<void(
void Connection::showTxError(const QString& error) { void Connection::showTxError(const QString& error) {
if (error.isNull()) return; if (error.isNull()) return;
// Prevent multiple dialog boxes from showing, because they're all called async
static bool shown = false;
if (shown)
return;
shown = true;
QMessageBox::critical(main, "Transaction Error", "There was an error sending the transaction. The error was: \n\n" QMessageBox::critical(main, "Transaction Error", "There was an error sending the transaction. The error was: \n\n"
+ error, QMessageBox::StandardButton::Ok); + error, QMessageBox::StandardButton::Ok);
shown = false;
} }
/** /**

16
src/mainwindow.cpp
View File

@@ -961,16 +961,16 @@ std::function<void(bool)> MainWindow::addZAddrsToComboList(bool sapling) {
void MainWindow::setupRecieveTab() { void MainWindow::setupRecieveTab() {
auto addNewTAddr = [=] () { auto addNewTAddr = [=] () {
rpc->newTaddr([=] (json reply) { rpc->newTaddr([=] (json reply) {
QString addr = QString::fromStdString(reply.get<json::string_t>()); QString addr = QString::fromStdString(reply.get<json::string_t>());
// Just double make sure the t-address is still checked // Just double make sure the t-address is still checked
if (ui->rdioTAddr->isChecked()) { if (ui->rdioTAddr->isChecked()) {
ui->listRecieveAddresses->insertItem(0, addr); ui->listRecieveAddresses->insertItem(0, addr);
ui->listRecieveAddresses->setCurrentIndex(0); ui->listRecieveAddresses->setCurrentIndex(0);
ui->statusBar->showMessage(tr("Created new t-Addr"), 10 * 1000); ui->statusBar->showMessage(tr("Created new t-Addr"), 10 * 1000);
} }
}); });
}; };
auto fnUpdateTAddrCombo = [=] (bool checked) { auto fnUpdateTAddrCombo = [=] (bool checked) {