projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
DeviceManager: Don't perform scans with DMM drivers
[pulseview.git]
/
main.cpp
diff --git
a/main.cpp
b/main.cpp
index e5472c2a0b14e9eacf32d380223019dd007947a7..ce7db5fadcc2a18a05d567a0ac284cfe7065595f 100644
(file)
--- a/
main.cpp
+++ b/
main.cpp
@@
-177,10
+177,17
@@
int main(int argc, char *argv[])
pv::DeviceManager device_manager(context);
// Initialise the main window
pv::DeviceManager device_manager(context);
// Initialise the main window
- pv::MainWindow w(device_manager, open_file, open_file_format,
- restore_sessions);
+ pv::MainWindow w(device_manager);
w.show();
w.show();
+ if (restore_sessions)
+ w.restore_sessions();
+
+ if (!open_file.empty())
+ w.add_session_with_file(open_file, open_file_format);
+ else
+ w.add_default_session();
+
#ifdef ENABLE_SIGNALS
if (SignalHandler::prepare_signals()) {
SignalHandler *const handler =
#ifdef ENABLE_SIGNALS
if (SignalHandler::prepare_signals()) {
SignalHandler *const handler =