From c5456e4a6a033fb0f1c5edf6ab80ce15befa9a8b Mon Sep 17 00:00:00 2001
From: Kristaps Kaupe <kristaps@blogiem.lv>
Date: Wed, 9 Feb 2022 03:38:04 +0200
Subject: [PATCH] Don't show nonwallet_custom_change_warning in Qt GUI for
 non-cj sends

---
 scripts/joinmarket-qt.py | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/scripts/joinmarket-qt.py b/scripts/joinmarket-qt.py
index 9f4902e..393b6dd 100755
--- a/scripts/joinmarket-qt.py
+++ b/scripts/joinmarket-qt.py
@@ -1211,21 +1211,21 @@ class SpendTab(QWidget):
                 if reply == QMessageBox.No:
                     return False
 
-            engine_recognized = True
-            try:
-                change_addr_type = mainWindow.wallet_service.get_outtype(
-                    change_addr)
-            except EngineError:
-                engine_recognized = False
-            wallet_type = mainWindow.wallet_service.get_txtype()
-            if (not engine_recognized) or (
-                change_addr_type != wallet_type and makercount > 0):
-                reply = JMQtMessageBox(self,
+            if makercount > 0:
+                engine_recognized = True
+                try:
+                    change_addr_type = mainWindow.wallet_service.get_outtype(
+                        change_addr)
+                except EngineError:
+                    engine_recognized = False
+                wallet_type = mainWindow.wallet_service.get_txtype()
+                if not engine_recognized or change_addr_type != wallet_type:
+                    reply = JMQtMessageBox(self,
                                        nonwallet_custom_change_warning,
                                        mbtype='question',
                                        title="Warning")
-                if reply == QMessageBox.No:
-                    return False
+                    if reply == QMessageBox.No:
+                        return False
 
         return True