From 256cb243803e3a668a96f456f5658bea48ca9c07 Mon Sep 17 00:00:00 2001
From: dreamsourcelabTAI <tzz@dreamsourcelab.com>
Date: Fri, 19 May 2023 15:55:27 +0800
Subject: [PATCH] fix: Can't remove the decoder

---
 DSView/pv/dock/protocoldock.cpp | 11 +++++++----
 DSView/pv/ui/msgbox.cpp         |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/DSView/pv/dock/protocoldock.cpp b/DSView/pv/dock/protocoldock.cpp
index 23dcfcf8..93572c76 100644
--- a/DSView/pv/dock/protocoldock.cpp
+++ b/DSView/pv/dock/protocoldock.cpp
@@ -421,8 +421,9 @@ bool ProtocolDock::add_protocol_by_id(QString id, bool silent, std::list<pv::dat
         return;
      }
 
-    if (MsgBox::Confirm(L_S(STR_PAGE_MSG, S_ID(IDS_MSG_DECODER_CONFIRM_DEL_ALL), "Are you sure to remove all decoder?"),  this)){
-         del_all_protocol();
+    QString strMsg(L_S(STR_PAGE_MSG, S_ID(IDS_MSG_DECODER_CONFIRM_DEL_ALL), "Are you sure to remove all decoder?"));
+    if (MsgBox::Confirm(strMsg,  this)){
+        del_all_protocol();
     }
  } 
 
@@ -842,8 +843,10 @@ void ProtocolDock::OnProtocolSetting(void *handle){
 }
 
 void ProtocolDock::OnProtocolDelete(void *handle){
-    if (!MsgBox::Confirm(L_S(STR_PAGE_MSG, S_ID(IDS_MSG_DECODER_CONFIRM_DEL), "Are you sure to remove this decoder?"), this)){
-         return;
+    QString strMsg(L_S(STR_PAGE_MSG, S_ID(IDS_MSG_DECODER_CONFIRM_DEL), "Are you sure to remove this decoder?"));
+
+    if (!MsgBox::Confirm(strMsg, this)){
+        return;
     } 
 
     for (auto it = _protocol_lay_items.begin(); it != _protocol_lay_items.end(); it++)
diff --git a/DSView/pv/ui/msgbox.cpp b/DSView/pv/ui/msgbox.cpp
index 3c3ef0d0..cbf7b5fd 100644
--- a/DSView/pv/ui/msgbox.cpp
+++ b/DSView/pv/ui/msgbox.cpp
@@ -85,7 +85,7 @@ void MsgBox::Show(const QString title, const QString text, const QString infoTex
 
 bool MsgBox::Confirm(const QString text, QWidget *parent)
 {
-    MsgBox::Confirm(text, "", parent);
+    return MsgBox::Confirm(text, "", parent);
 }
 
 bool MsgBox::Confirm(const QString text, const QString infoText, QWidget *parent)