Changeset 4446 in ntrip for trunk

Timestamp:

Jul 29, 2012, 2:33:45 PM (13 years ago)

Author:

mervart

Message:

 

File:

• trunk/BNC/src/bncmain.cpp (modified) (5 diffs)

trunk/BNC/src/bncmain.cpp

@@ -67 +67 @@
 int main(int argc, char *argv[]) {
 
-  bool       GUIenabled  = true;
+  bool       interactive  = true;
   QByteArray rawFileName;
   QString    confFileName;
@@ -82 +82 @@
     }
     if (QRegExp("--?nw").exactMatch(argv[ii])) {
-      GUIenabled = false;
+      interactive = false;
     }
     if (ii + 1 < argc) {
@@ -89 +89 @@
       }
       if (QRegExp("--?file").exactMatch(argv[ii])) {
-        GUIenabled = false;
+        interactive = false;
         rawFileName = QByteArray(argv[ii+1]);
       }
@@ -96 +96 @@
 
 #ifdef Q_OS_MAC
-  if (argc== 3 && GUIenabled) {
+  if (argc== 3 && interactive) {
     confFileName = QString(argv[2]);
   }
 #else
-  if (argc == 2 && GUIenabled) {
+  if (argc == 2 && interactive) {
     confFileName = QString(argv[1]);
   }
 #endif
 
-  bncApp app(argc, argv, GUIenabled);
+#ifdef Q_WS_X11
+  bool useGUI = getenv("DISPLAY") != 0;
+#else
+  bool useGUI = true;
+#endif
+ 
+  bncApp app(argc, argv, useGUI);
 
   app.setApplicationName("BNC");
@@ -124 +130 @@
   // Interactive Mode - open the main window
   // ---------------------------------------
-  if (GUIenabled) {
+  if (interactive) {
 
     app.setMode(bncApp::interactive);