Fix GUI mode check

pixeltris · Nov 13, 2020 · 26c0aa7 · 26c0aa7
1 parent 156fa9e
commit 26c0aa7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 12 deletions.
diff --git a/GK6X/GK6X-gui.bat b/GK6X/GK6X-gui.bat
@@ -1 +1 @@
-call %WINDIR%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe GK6X.csproj /p:Configuration=Debug /p:OutputType=Winexe /p:AssemblyName=GK6X-gui
+call %WINDIR%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe GK6X.csproj /p:Configuration=Debug /p:OutputType=Winexe /p:AssemblyName=GK6X-gui /p:DefineConstants=AS_GUI
diff --git a/GK6X/Program.cs b/GK6X/Program.cs
@@ -16,7 +16,11 @@ class Program
 
         static void Main(string[] args)
         {
+#if AS_GUI
+            Run(asGUI: true);
+#else
             Run(asGUI: false);
+#endif
             Stop();
         }
 
@@ -36,17 +40,6 @@ static void Stop()
 
         static void Run(bool asGUI)
         {
-            try
-            {
-                if (Process.GetCurrentProcess().MainWindowHandle == IntPtr.Zero)
-                {
-                    asGUI = true;
-                }
-            }
-            catch
-            {
-            }
-
             BasePath = Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location);
             DataBasePath = Path.Combine(BasePath, DataBasePath);
             UserDataPath = Path.Combine(BasePath, UserDataPath);
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		call %WINDIR%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe GK6X.csproj /p:Configuration=Debug /p:OutputType=Winexe /p:AssemblyName=GK6X-gui
		call %WINDIR%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe GK6X.csproj /p:Configuration=Debug /p:OutputType=Winexe /p:AssemblyName=GK6X-gui /p:DefineConstants=AS_GUI