projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Moved default device selection into MainWindow
[pulseview.git]
/
pv
/
mainwindow.cpp
diff --git
a/pv/mainwindow.cpp
b/pv/mainwindow.cpp
index 767ab6f31149bd4881b0db163635c86025c08818..eb567af8dfe077d4954ffe6613333e7bb2f61da2 100644
(file)
--- a/
pv/mainwindow.cpp
+++ b/
pv/mainwindow.cpp
@@
-194,7
+194,10
@@
void MainWindow::run_stop()
void MainWindow::select_device(shared_ptr<devices::Device> device)
{
try {
void MainWindow::select_device(shared_ptr<devices::Device> device)
{
try {
- session_.set_device(device);
+ if (device)
+ session_.set_device(device);
+ else
+ session_.set_default_device();
} catch(const QString &e) {
QMessageBox msg(this);
msg.setText(e);
} catch(const QString &e) {
QMessageBox msg(this);
msg.setText(e);
@@
-540,10
+543,8
@@
void MainWindow::restore_ui_settings()
const shared_ptr<devices::HardwareDevice> device =
device_manager_.find_device_from_info(dev_info);
const shared_ptr<devices::HardwareDevice> device =
device_manager_.find_device_from_info(dev_info);
- if (device) {
- select_device(device);
- update_device_list();
- }
+ select_device(device);
+ update_device_list();
settings.endGroup();
}
settings.endGroup();
}