From 2460bb4f25f34f4480897c1ee799c552f0dc8fd7 Mon Sep 17 00:00:00 2001
From: dreamsourcelabTAI <tzz@dreamsourcelab.com>
Date: Sat, 17 Jun 2023 20:45:52 +0800
Subject: [PATCH] When there are multiple triggers on the simple trigger mode,
 prompt the user

---
 DSView/pv/config/appconfig.cpp | 2 ++
 DSView/pv/dock/triggerdock.cpp | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/DSView/pv/config/appconfig.cpp b/DSView/pv/config/appconfig.cpp
index eaac3809..795a4b91 100644
--- a/DSView/pv/config/appconfig.cpp
+++ b/DSView/pv/config/appconfig.cpp
@@ -123,6 +123,8 @@ static void _loadApp(AppOptions &o, QSettings &st)
     getFiled("swapBackBufferAlways", st, o.swapBackBufferAlways, false);
     getFiled("fontSize", st, o.fontSize, 9.0);
 
+    o.warnofMultiTrig = true;
+
     QString fmt;
     getFiled("protocalFormats", st, fmt, "");
     if (fmt != ""){
diff --git a/DSView/pv/dock/triggerdock.cpp b/DSView/pv/dock/triggerdock.cpp
index 2c495d92..3e238bf1 100644
--- a/DSView/pv/dock/triggerdock.cpp
+++ b/DSView/pv/dock/triggerdock.cpp
@@ -966,7 +966,8 @@ void TriggerDock::try_commit_trigger()
             }
         }
 
-        if (app.appOptions.warnofMultiTrig && num > 1) {
+        if (app.appOptions.warnofMultiTrig && num > 1)
+        {
             dialogs::DSMessageBox msg(this);
             msg.mBox()->setText(L_S(STR_PAGE_MSG, S_ID(IDS_MSG_TRIGGER), "Trigger"));
             msg.mBox()->setInformativeText(L_S(STR_PAGE_MSG, S_ID(IDS_MSG_SET_TRI_MULTI_CHANNEL), 
@@ -991,8 +992,7 @@ void TriggerDock::try_commit_trigger()
 
             if (msg.mBox()->clickedButton() == noMoreButton)
             {
-                app.appOptions.warnofMultiTrig  = false;
-                app.SaveApp();                
+                app.appOptions.warnofMultiTrig  = false;              
             }
         }
     }