Session/MainBar: Fix device change handling

[pulseview.git] / pv / session.cpp

diff --git a/pv/session.cpp b/pv/session.cpp
index 99de77495307386a01be90099c6a6a28402871f5..da9da12628690cc0b408c1cd5c9eb449bd78ceea 100644 (file)
--- a/pv/session.cpp
+++ b/pv/session.cpp
@@ -26,12 +26,13 @@
 #include <boost/thread/locks.hpp>
 #include <boost/thread/shared_mutex.hpp>
 
-#ifdef ENABLE_DECODE
-#include <libsigrokdecode/libsigrokdecode.h>
-#endif
+#include <cassert>
+#include <mutex>
+#include <stdexcept>
 
-#include "session.hpp"
+#include <sys/stat.h>
 
+#include "session.hpp"
 #include "devicemanager.hpp"
 
 #include "data/analog.hpp"
@@ -53,16 +54,12 @@
 #include "view/signal.hpp"
 #include "view/view.hpp"
 
-#include <cassert>
-#include <mutex>
-#include <stdexcept>
-
-#include <sys/stat.h>
-
-#include <QDebug>
-
 #include <libsigrokcxx/libsigrokcxx.hpp>
 
+#ifdef ENABLE_DECODE
+#include <libsigrokdecode/libsigrokdecode.h>
+#endif
+
 using boost::shared_lock;
 using boost::shared_mutex;
 using boost::unique_lock;
@@ -273,7 +270,7 @@ void Session::set_device(shared_ptr<devices::Device> device)
                device_->open();
        } catch (const QString &e) {
                device_.reset();
-               device_selected();
+               device_changed();
                throw;
        }
 
@@ -283,7 +280,7 @@ void Session::set_device(shared_ptr<devices::Device> device)
                });
 
        update_signals();
-       device_selected();
+       device_changed();
 }
 
 void Session::set_default_device()