From a64b22855ab84fd9a54365f327726844e95fcf3e Mon Sep 17 00:00:00 2001
From: dreamsourcelabTAI <tzz@dreamsourcelab.com>
Date: Wed, 7 Jun 2023 15:26:12 +0800
Subject: [PATCH] Prevent multiple clicks on the 'collect' button

---
 DSView/pv/toolbars/samplingbar.cpp | 63 ++++++++++++++++++------------
 DSView/pv/toolbars/samplingbar.h   |  3 ++
 2 files changed, 40 insertions(+), 26 deletions(-)

diff --git a/DSView/pv/toolbars/samplingbar.cpp b/DSView/pv/toolbars/samplingbar.cpp
index f1543cc7..a1c99662 100644
--- a/DSView/pv/toolbars/samplingbar.cpp
+++ b/DSView/pv/toolbars/samplingbar.cpp
@@ -799,27 +799,31 @@ namespace pv
             }
         }
 
-        // start or stop capture
         void SamplingBar::on_run_stop()
         {
+            _run_stop_action->setEnabled(false);
+
+            if (action_run_stop() == false){
+                _run_stop_action->setEnabled(true);
+            }
+        }
+
+        // start or stop capture
+        bool SamplingBar::action_run_stop()
+        {    
             if (_session->is_doing_action()){
-                dsv_info("Task is busy.");
-                return;
+                dsv_info("Task is busy.");              
+                return false;
             }
 
-            if (_session->is_working())
-            {   
-                _run_stop_action->setEnabled(false);
-                if (_session->stop_capture() == false){
-                    _run_stop_action->setEnabled(true);
-                }
-                return;
+            if (_session->is_working()){
+                return _session->stop_capture();
             }
 
             if (_device_agent->have_instance() == false)
             {
                 dsv_info("%s", "Have no device, can't to collect data.");
-                return;
+                return false;
             }
 
             commit_settings();
@@ -844,7 +848,7 @@ namespace pv
                         _device_agent->set_config_bool(SR_CONF_ZERO, false);
                         update_view_status();
                     }
-                    return;                     
+                    return false;                    
                 }
             }
 
@@ -854,7 +858,9 @@ namespace pv
             }
 
             _is_run_as_instant = false;
-            _session->start_capture(false);
+            bool ret = _session->start_capture(false);
+
+            return ret;
         }
 
         void SamplingBar::on_instant_stop()
@@ -863,25 +869,28 @@ namespace pv
                 return;
             }
 
+            _instant_action->setEnabled(false);
+            
+            if (action_instant_stop() == false){
+                _instant_action->setEnabled(true);
+            }
+        }
+
+        bool SamplingBar::action_instant_stop()
+        { 
             if (_session->is_doing_action()){
                 dsv_info("Task is busy.");
-                return;
+                return false;
             }
 
-            if (_session->is_working())
-            {
-                _instant_action->setEnabled(false);
-                if (_session->stop_capture() == false){
-                    _instant_action->setEnabled(true);
-                }
-                return;
-            }
-            
+            if (_session->is_working()){ 
+                return _session->stop_capture();
+            }            
             
             if (_device_agent->have_instance() == false)
             {
                 dsv_info("%s", "Error! Have no device, can't to collect data.");
-                return;
+                return false;
             }
 
             commit_settings();
@@ -904,7 +913,7 @@ namespace pv
                         _device_agent->set_config_bool(SR_CONF_ZERO, false);
                         update_view_status();
                     }
-                    return;                    
+                    return false;            
                 }
             }
 
@@ -914,7 +923,9 @@ namespace pv
             }
             
             _is_run_as_instant = true;
-            _session->start_capture(true);        
+            bool ret = _session->start_capture(true);
+
+            return ret;  
         }
 
         void SamplingBar::on_device_selected()
diff --git a/DSView/pv/toolbars/samplingbar.h b/DSView/pv/toolbars/samplingbar.h
index 6a173cf3..f4774a68 100644
--- a/DSView/pv/toolbars/samplingbar.h
+++ b/DSView/pv/toolbars/samplingbar.h
@@ -121,6 +121,9 @@ namespace pv
             void enable_toggle(bool enable);
             void update_mode_icon();
 
+            bool action_run_stop();
+            bool action_instant_stop();
+
         private slots:
             void on_collect_mode();
             void on_run_stop();