Update from DSLogic-v0.3.tar.gzHEADmaster

Signed-off-by: Sven Wegener <sven.wegener@stealer.net>

1 files changed, 9 insertions, 8 deletions

diff --git a/DSLogic-gui/pv/toolbars/devicebar.cpp b/DSLogic-gui/pv/toolbars/devicebar.cpp
index 1c49f86..3d38a31 100644
--- a/DSLogic-gui/pv/toolbars/devicebar.cpp
+++ b/DSLogic-gui/pv/toolbars/devicebar.cpp
@@ -31,6 +31,7 @@
 

 #include <QAction>

 #include <QDebug>

+#include <QMessageBox>

 

 #include "devicebar.h"

 

@@ -114,20 +115,20 @@ void DeviceBar::on_device_selected()
 

 void DeviceBar::on_configure()

 {

-    int  dev_mode;

+    int  dev_mode, ret;

     sr_dev_inst *const sdi = get_selected_device();

     assert(sdi);

 

     dev_mode = sdi->mode;

 

     pv::dialogs::DeviceOptions dlg(this, sdi);

-    //ret = dlg.exec();

-    //if (ret == QDialog::Accepted) {

-    if (dlg.exec()) {

-        if (dev_mode != sdi->mode)

-                device_selected();

-            else

-                device_updated();

+    ret = dlg.exec();

+    if (ret == QDialog::Accepted) {

+        if (dev_mode != sdi->mode) {

+            device_selected();

+        } else {

+            device_updated();

+        }

     }

 }