Browse Source

Fixed vt argument detection, thanks to Henrik Brix Andersen

git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/slim/trunk@114 7c53e7cc-98ea-0310-8f1f-a0b24da60408
sip 17 years ago
parent
commit
4bfecddc5d
1 changed files with 11 additions and 7 deletions
  1. 11 7
      app.cpp

+ 11 - 7
app.cpp

@@ -560,13 +560,6 @@ int App::StartServer() {
         } else if (pos == 0) {
             server[argc++] = args+pos;
         }
-        if (server[argc-1][0] == 'v' && server[argc-1][1] == 't') {
-            bool ok = false;
-            Cfg::string2int(server[argc-1]+2, &ok);
-            if (ok) {
-                hasVtSet = true;
-            }
-        }
         ++pos;
 
         if (argc+1 >= MAX_XSERVER_ARGS) {
@@ -576,6 +569,17 @@ int App::StartServer() {
             break;
         }
     }
+
+    for (int i=0; i<argc; i++) {
+        if (server[i][0] == 'v' && server[i][1] == 't') {
+            bool ok = false;
+            Cfg::string2int(server[i]+2, &ok);
+            if (ok) {
+                hasVtSet = true;
+            }
+        }
+    }
+
     if (!hasVtSet && daemonmode) {
         server[argc++] = "vt07";
     }