Reworked SamplingBar device selection logic

[pulseview.git] / pv / mainwindow.cpp

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index 7a7a1b12baddf2ee85acdf65ee2cd64b3db09e86..0089b112a721f1585a9813134328cfd30c360ccb 100644 (file)
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -299,11 +299,9 @@ void MainWindow::update_device_list()
        if (std::find(devices.begin(), devices.end(), selected_device) ==
                devices.end())
                devices.push_back(selected_device);
        if (std::find(devices.begin(), devices.end(), selected_device) ==
                devices.end())
                devices.push_back(selected_device);

+       assert(selected_device);

 
 

-       _sampling_bar->set_device_list(devices);
-
-       if (selected_device)
-               _sampling_bar->set_selected_device(selected_device);
+       _sampling_bar->set_device_list(devices, selected_device);

 }
 
 void MainWindow::load_file(QString file_name)
 }
 
 void MainWindow::load_file(QString file_name)