From bacbcbe1d5f6664e9782852b5d8872255065b6c5 Mon Sep 17 00:00:00 2001
From: dreamsourcelabTAI <tzz@dreamsourcelab.com>
Date: Mon, 20 Mar 2023 19:15:09 +0800
Subject: [PATCH] fix: The Scope can't auto calibration success

---
 DSView/pv/dialogs/waitingdialog.cpp | 5 +++++
 DSView/pv/dialogs/waitingdialog.h   | 2 ++
 DSView/pv/mainwindow.cpp            | 4 ++--
 DSView/pv/toolbars/samplingbar.cpp  | 2 +-
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/DSView/pv/dialogs/waitingdialog.cpp b/DSView/pv/dialogs/waitingdialog.cpp
index f81aa411..54abe8ee 100644
--- a/DSView/pv/dialogs/waitingdialog.cpp
+++ b/DSView/pv/dialogs/waitingdialog.cpp
@@ -93,6 +93,11 @@ WaitingDialog::WaitingDialog(QWidget *parent, SigSession *session, int key) :
     setTitle(L_S(STR_PAGE_DLG, S_ID(IDS_DLG_AUTO_CALIBRATION), "Auto Calibration"));
 }
 
+WaitingDialog::~WaitingDialog()
+{
+
+}
+
 void WaitingDialog::accept()
 {
 	using namespace Qt;
diff --git a/DSView/pv/dialogs/waitingdialog.h b/DSView/pv/dialogs/waitingdialog.h
index 8609c0ec..8bfa4b18 100644
--- a/DSView/pv/dialogs/waitingdialog.h
+++ b/DSView/pv/dialogs/waitingdialog.h
@@ -54,6 +54,8 @@ private:
 
 public:
     WaitingDialog(QWidget *parent, SigSession *session, int key);
+    ~WaitingDialog();
+    
     int start();
 
 protected:
diff --git a/DSView/pv/mainwindow.cpp b/DSView/pv/mainwindow.cpp
index ebb4cc24..d9d9a2ae 100644
--- a/DSView/pv/mainwindow.cpp
+++ b/DSView/pv/mainwindow.cpp
@@ -689,7 +689,7 @@ namespace pv
             s_obj["type"] = s->get_type();
             s_obj["enabled"] = s->enabled();
             s_obj["name"] = s->get_name();
-            
+
             if (s->get_colour().isValid())
                 s_obj["colour"] = QJsonValue::fromVariant(s->get_colour());
             else
@@ -1638,7 +1638,6 @@ namespace pv
             break;
 
         case DSV_MSG_END_COLLECT_WORK:
-            _session->device_event_object()->device_updated();
             update_toolbar_view_status();           
             break;
 
@@ -1660,6 +1659,7 @@ namespace pv
             reset_all_view();
             _logo_bar->dsl_connected(_session->get_device()->is_hardware());
             update_toolbar_view_status();
+            _session->device_event_object()->device_updated();
 
             if (_device_agent->is_file())
             {
diff --git a/DSView/pv/toolbars/samplingbar.cpp b/DSView/pv/toolbars/samplingbar.cpp
index e4ebe60c..4a8a0adf 100644
--- a/DSView/pv/toolbars/samplingbar.cpp
+++ b/DSView/pv/toolbars/samplingbar.cpp
@@ -336,7 +336,7 @@ namespace pv
             commit_hori_res();
 
             if (_session->is_working() == false)
-                _session->start_capture(true);
+                _session->start_capture(false);
 
             pv::dialogs::WaitingDialog wait(this, _session, SR_CONF_ZERO);
             if (wait.start() == QDialog::Rejected)