From dee7592ae66ef2357ac44346046caa5b9aecf37e Mon Sep 17 00:00:00 2001
From: Sean McArdle <sean.mcardle0@gmail.com>
Date: Fri, 3 Mar 2017 12:00:59 -0800
Subject: [PATCH] Fixed checking for modeset on start.

---
 WifiSitter/Configuration.cs           | 6 ++++--
 WifiSitter/Helpers/AbstractService.cs | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/WifiSitter/Configuration.cs b/WifiSitter/Configuration.cs
index 902035e..7d55547 100644
--- a/WifiSitter/Configuration.cs
+++ b/WifiSitter/Configuration.cs
@@ -23,7 +23,7 @@ namespace WifiSitter
             var opts = new OptionSet() {
                 {"h|?|help", "Show this help and exit.",
                     v => showHelp = v != null },
-                {"i|ipc", "Enable IPC communication for GUI.",
+                {"i|ipc", "Option to enable IPC communication for GUI.",
                     v => enableIPC = v != null},
                 {"console|service", "Direct wifisitter mode of operation.",
                     v => mode = v.ToLower() },
@@ -49,7 +49,9 @@ namespace WifiSitter
             return _options[key];
         }
 
-        public static bool OptionsSet { get { return _options != null; } }
+        public static bool IsOptionsSet { get { return _options != null; } }
+
+        public static bool IsModeSet { get { if (IsOptionsSet) { return !String.IsNullOrEmpty((string)_options["operating_mode"]); }; return false; } }
 
         public static void ShowHelp(OptionSet opts, int exitCode = 0) {
             Console.WriteLine("Usage: wifisitter.exe [option] [directive]");
diff --git a/WifiSitter/Helpers/AbstractService.cs b/WifiSitter/Helpers/AbstractService.cs
index 7779f8c..d26cdba 100644
--- a/WifiSitter/Helpers/AbstractService.cs
+++ b/WifiSitter/Helpers/AbstractService.cs
@@ -72,11 +72,11 @@ USAGE
         {
             Environment.CurrentDirectory = AppDomain.CurrentDomain.BaseDirectory;
 
-            if (!Configuration.OptionsSet && Debugger.IsAttached)
+            if (!Configuration.IsModeSet && Debugger.IsAttached)
             {
                 Configuration.SetOptions( new[] { "--console" } );
             }
-            else if (!Configuration.OptionsSet) {
+            else if (!Configuration.IsModeSet) {
                 Configuration.SetOptions(new[] { "-h" });
             }