Revert back to the default device if a session file failed to load

[pulseview.git] / pv / sigsession.cpp

diff --git a/pv/sigsession.cpp b/pv/sigsession.cpp
index b93ecc85952ecc4053169782bd666bdd06cd968f..c152481e9841814d93669c8c85e3cccf2176e94c 100644 (file)
--- a/pv/sigsession.cpp
+++ b/pv/sigsession.cpp
@@ -126,6 +126,28 @@ void SigSession::set_file(const string &name) throw(QString)
        set_device(shared_ptr<device::DevInst>(device::File::create(name)));
 }
 
+void SigSession::set_default_device()
+{
+       shared_ptr<pv::device::DevInst> default_device;
+       const list< shared_ptr<device::Device> > &devices =
+               _device_manager.devices();
+
+       if (!devices.empty()) {
+               // Fall back to the first device in the list.
+               default_device = devices.front();
+
+               // Try and find the demo device and select that by default
+               BOOST_FOREACH (shared_ptr<pv::device::Device> dev, devices)
+                       if (strcmp(dev->dev_inst()->driver->name,
+                               "demo") == 0) {
+                               default_device = dev;
+                               break;
+                       }
+       }
+
+       set_device(default_device);
+}
+
 void SigSession::release_device(device::DevInst *dev_inst)
 {
        (void)dev_inst;
@@ -290,28 +312,6 @@ void SigSession::set_capture_state(capture_state state)
                capture_state_changed(state);
 }
 
-void SigSession::set_default_device()
-{
-       shared_ptr<pv::device::DevInst> default_device;
-       const list< shared_ptr<device::Device> > &devices =
-               _device_manager.devices();
-
-       if (!devices.empty()) {
-               // Fall back to the first device in the list.
-               default_device = devices.front();
-
-               // Try and find the demo device and select that by default
-               BOOST_FOREACH (shared_ptr<pv::device::Device> dev, devices)
-                       if (strcmp(dev->dev_inst()->driver->name,
-                               "demo") == 0) {
-                               default_device = dev;
-                               break;
-                       }
-       }
-
-       set_device(default_device);
-}
-
 void SigSession::update_signals(shared_ptr<device::DevInst> dev_inst)
 {
        assert(dev_inst);