main window: Prefer the user specified device in new sessions

Prefer the device that was found with user provided scan options when a
-d command line option was specified. Stick with the previous selection
of "genuine" devices before demo otherwise (when nothing was found, or
when -d was not specified).

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index 8b11d0822d53c8960583e742117fcc76abdc52cd..119ce0a791ba22a2aa1d6b1702a387fd6bef9caf 100644 (file)
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -338,20 +338,26 @@ void MainWindow::add_default_session()
 
        shared_ptr<Session> session = add_session();
 
 
        shared_ptr<Session> session = add_session();
 

-       map<string, string> dev_info;
-       shared_ptr<devices::HardwareDevice> other_device, demo_device;
-
-       // Use any available device that's not demo
+       // Check the list of available devices. Prefer the one that was
+       // found with user supplied scan specs (if applicable). Then try
+       // one of the auto detected devices that are not the demo device.
+       // Pick demo in the absence of "genuine" hardware devices.
+       shared_ptr<devices::HardwareDevice> user_device, other_device, demo_device;

        for (shared_ptr<devices::HardwareDevice> dev : device_manager_.devices()) {
        for (shared_ptr<devices::HardwareDevice> dev : device_manager_.devices()) {

-               if (dev->hardware_device()->driver()->name() == "demo") {
+               if (dev == device_manager_.user_spec_device()) {
+                       user_device = dev;
+               } else if (dev->hardware_device()->driver()->name() == "demo") {

                        demo_device = dev;
                } else {
                        other_device = dev;
                }
        }
                        demo_device = dev;
                } else {
                        other_device = dev;
                }
        }

-
-       // ...and if there isn't any, just use demo then
-       session->select_device(other_device ? other_device : demo_device);
+       if (user_device)
+               session->select_device(user_device);
+       else if (other_device)
+               session->select_device(other_device);
+       else
+               session->select_device(demo_device);

 }
 
 void MainWindow::save_sessions()
 }
 
 void MainWindow::save_sessions()