projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
format_time(): Use the timestamp type in the calculation
[pulseview.git]
/
main.cpp
diff --git
a/main.cpp
b/main.cpp
index 61ec03a840243be3dd11f4654d8c9f6fa76b6590..97a61280ac5bc0462dc2da35d179ecd129a54ecf 100644
(file)
--- a/
main.cpp
+++ b/
main.cpp
@@
-128,9
+128,11
@@
int main(int argc, char *argv[])
}
}
}
}
- if (argc
!= optind
) {
- fprintf(stderr, "
Unexpected argument: %s\n", argv[optind]
);
+ if (argc
- optind > 1
) {
+ fprintf(stderr, "
Only one file can be openened.\n"
);
return 1;
return 1;
+ } else if (argc - optind == 1) {
+ open_file = argv[argc - 1];
}
// Initialise libsigrok
}
// Initialise libsigrok
@@
-159,7
+161,7
@@
int main(int argc, char *argv[])
w.show();
#ifdef ENABLE_SIGNALS
w.show();
#ifdef ENABLE_SIGNALS
- if(SignalHandler::prepare_signals()) {
+ if
(SignalHandler::prepare_signals()) {
SignalHandler *const handler =
new SignalHandler(&w);
QObject::connect(handler,
SignalHandler *const handler =
new SignalHandler(&w);
QObject::connect(handler,