From d71d08cd88b8ff83ce70a3b3d19620867b8c0e2e Mon Sep 17 00:00:00 2001
From: adityapk00 <adityapk@gmail.com>
Date: Fri, 23 Nov 2018 11:10:16 -0800
Subject: [PATCH] Prevent error dialog reentry

---
 src/addresscombo.cpp |  1 -
 src/connection.cpp   |  7 +++++++
 src/mainwindow.cpp   | 16 ++++++++--------
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/addresscombo.cpp b/src/addresscombo.cpp
index 83de3f9..f7cbeee 100644
--- a/src/addresscombo.cpp
+++ b/src/addresscombo.cpp
@@ -4,7 +4,6 @@
 
 AddressCombo::AddressCombo(QWidget* parent) : 
     QComboBox(parent) {
-
 }
 
 QString AddressCombo::itemText(int i) {
diff --git a/src/connection.cpp b/src/connection.cpp
index 37971cb..a36cab6 100644
--- a/src/connection.cpp
+++ b/src/connection.cpp
@@ -657,8 +657,15 @@ void Connection::doRPCIgnoreError(const json& payload, const std::function<void(
 void Connection::showTxError(const QString& error) {
     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"
         + error, QMessageBox::StandardButton::Ok);
+    shown = false;
 }
 
 /**
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index d2496b9..b623cbb 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -961,16 +961,16 @@ std::function<void(bool)> MainWindow::addZAddrsToComboList(bool sapling) {
 void MainWindow::setupRecieveTab() {
     auto addNewTAddr = [=] () {
         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
-                if (ui->rdioTAddr->isChecked()) {
-                    ui->listRecieveAddresses->insertItem(0, addr);
-                    ui->listRecieveAddresses->setCurrentIndex(0);
+            // Just double make sure the t-address is still checked
+            if (ui->rdioTAddr->isChecked()) {
+                ui->listRecieveAddresses->insertItem(0, addr);
+                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) {