Changeset 14736

Timestamp:

12/05/12 20:00:52 (12 years ago)

Author:

tbretz

Message:

If we are a server and force-console is not given Main.h must not see a valid entry for 'console', otherwise it will wrongly try to configure the shell for console mode.

File:

• trunk/FACT++/src/dimctrl.cc (modified) (1 diff)

trunk/FACT++/src/dimctrl.cc

@@ -94 +94 @@
         throw runtime_error("--force-console must be used with --console/-c");
 
-    if ((!conf.Has("console") || conf.Get<bool>("server")) && !conf.Get<bool>("force-console"))
+    if (conf.Get<bool>("server") && !conf.Get<bool>("force-console"))
+        conf.Remove("console");
+
+    if (!conf.Has("console"))
         return RunShell<RemoteStream>(conf);