-rw-r--r-- | noncore/net/wellenreiter/ChangeLog | 1 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/main.cpp | 21 |
2 files changed, 20 insertions, 2 deletions
diff --git a/noncore/net/wellenreiter/ChangeLog b/noncore/net/wellenreiter/ChangeLog index 55e13fc..755ed76 100644 --- a/noncore/net/wellenreiter/ChangeLog +++ b/noncore/net/wellenreiter/ChangeLog | |||
@@ -2,2 +2,3 @@ | |||
2 | 2 | ||
3 | * Added command line option "-nocheck" to skip non-root and dhcp tests | ||
3 | * Improved the speed reading the manufacturer list | 4 | * Improved the speed reading the manufacturer list |
diff --git a/noncore/net/wellenreiter/gui/main.cpp b/noncore/net/wellenreiter/gui/main.cpp index 55a5260..dd757b5 100644 --- a/noncore/net/wellenreiter/gui/main.cpp +++ b/noncore/net/wellenreiter/gui/main.cpp | |||
@@ -54,3 +54,17 @@ int main( int argc, char **argv ) | |||
54 | int result = -1; | 54 | int result = -1; |
55 | static int killed = false; | ||
55 | 56 | ||
57 | bool check = true; | ||
58 | for ( int i = 1; i < argc; ++i ) | ||
59 | { | ||
60 | if ( !strcmp( "-nocheck", argv[i] ) ) | ||
61 | { | ||
62 | qDebug( "-nocheck found" ); | ||
63 | check = false; | ||
64 | break; | ||
65 | } | ||
66 | } | ||
67 | |||
68 | if ( check ) | ||
69 | { | ||
56 | // root check | 70 | // root check |
@@ -68,4 +82,2 @@ int main( int argc, char **argv ) | |||
68 | 82 | ||
69 | static int killed = false; | ||
70 | |||
71 | QString line; | 83 | QString line; |
@@ -99,2 +111,3 @@ int main( int argc, char **argv ) | |||
99 | } | 111 | } |
112 | } | ||
100 | 113 | ||
@@ -102,2 +115,5 @@ int main( int argc, char **argv ) | |||
102 | 115 | ||
116 | if ( check ) | ||
117 | { | ||
118 | |||
103 | if ( killed ) | 119 | if ( killed ) |
@@ -112,2 +128,3 @@ int main( int argc, char **argv ) | |||
112 | delete w; | 128 | delete w; |
129 | } | ||
113 | return 0; | 130 | return 0; |