From fbf9183187a1922aa0af372b13961b8dd1a4c4b1 Mon Sep 17 00:00:00 2001
From: Bitl <bitlblox@gmail.com>
Date: Fri, 10 Mar 2023 10:00:23 -0700
Subject: [PATCH] console changes

---
 Novetus/NovetusLauncher/Classes/LocalVars.cs   |  5 ++++-
 .../Forms/LauncherForm/LauncherFormShared.cs   |  2 +-
 .../NovetusLauncher/Forms/NovetusConsole.cs    |  9 ++++++---
 .../NovetusLauncherEntryPoint.cs               | 18 ++++++++++--------
 4 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/Novetus/NovetusLauncher/Classes/LocalVars.cs b/Novetus/NovetusLauncher/Classes/LocalVars.cs
index 4d4b79d..8c6e7de 100644
--- a/Novetus/NovetusLauncher/Classes/LocalVars.cs
+++ b/Novetus/NovetusLauncher/Classes/LocalVars.cs
@@ -1,4 +1,6 @@
 
+using System.Collections.Generic;
+
 namespace NovetusLauncher
 {
     #region LocalVars
@@ -9,7 +11,8 @@ namespace NovetusLauncher
         public static string prevsplash = "";
         public static bool launcherInitState = true;
         //hack for linux. store the command line variables locally.
-        public static string cmdLine = "";
+        public static List<string> cmdLineArray = new List<string>();
+        public static string cmdLineString = "";
         #endregion
     }
     #endregion
diff --git a/Novetus/NovetusLauncher/Forms/LauncherForm/LauncherFormShared.cs b/Novetus/NovetusLauncher/Forms/LauncherForm/LauncherFormShared.cs
index d1fc99b..cddad90 100644
--- a/Novetus/NovetusLauncher/Forms/LauncherForm/LauncherFormShared.cs
+++ b/Novetus/NovetusLauncher/Forms/LauncherForm/LauncherFormShared.cs
@@ -574,7 +574,7 @@ namespace NovetusLauncher
         public void RestartApp()
         {
             var process = Process.GetCurrentProcess();
-            Process.Start(Assembly.GetExecutingAssembly().Location, LocalVars.cmdLine);
+            Process.Start(Assembly.GetExecutingAssembly().Location, LocalVars.cmdLineString);
             CloseEventInternal();
         }
 
diff --git a/Novetus/NovetusLauncher/Forms/NovetusConsole.cs b/Novetus/NovetusLauncher/Forms/NovetusConsole.cs
index 2e4514b..757b823 100644
--- a/Novetus/NovetusLauncher/Forms/NovetusConsole.cs
+++ b/Novetus/NovetusLauncher/Forms/NovetusConsole.cs
@@ -23,10 +23,10 @@ namespace NovetusLauncher
         string[] argList;
         FileFormat.Config savedConfig;
 
-        public NovetusConsole(string[] args)
+        public NovetusConsole()
         {
             ConsoleForm = new LauncherFormShared();
-            argList = args;
+            argList = LocalVars.cmdLineArray.ToArray();
             InitializeComponent();
         }
 
@@ -86,7 +86,7 @@ namespace NovetusLauncher
             {
                 //cmd mode
                 savedConfig = GlobalVars.UserConfiguration;
-                disableCommands = true;
+                //disableCommands = true;
                 bool no3d = false;
                 bool nomap = false;
 
@@ -487,6 +487,9 @@ namespace NovetusLauncher
                     }
                     ScrollToEnd();
                     break;
+                case string cmdArgs when cmdArgs.Contains("commandline", StringComparison.InvariantCultureIgnoreCase) == true:
+                    Util.ConsolePrint(LocalVars.cmdLineString, 3);
+                    break;
                 default:
                     Util.ConsolePrint("Command is either not registered or valid", 2);
                     ScrollToEnd();
diff --git a/Novetus/NovetusLauncher/NovetusLauncherEntryPoint.cs b/Novetus/NovetusLauncher/NovetusLauncherEntryPoint.cs
index d15ebe5..d2be7b1 100644
--- a/Novetus/NovetusLauncher/NovetusLauncherEntryPoint.cs
+++ b/Novetus/NovetusLauncher/NovetusLauncherEntryPoint.cs
@@ -81,17 +81,19 @@ namespace NovetusLauncher
                 }
             }
 
-            foreach (string argString in args)
-            {
-                LocalVars.cmdLine += argString;
+            LocalVars.cmdLineArray = args.ToList();
 
-                if (!argString.Equals(args.Last()))
+            foreach (string argString in LocalVars.cmdLineArray)
+            {
+                LocalVars.cmdLineString += argString;
+
+                if (!argString.Equals(LocalVars.cmdLineArray.Last()))
                 {
-                    LocalVars.cmdLine += " ";
+                    LocalVars.cmdLineString += " ";
                 }
             }
 
-            Run(args, isSDK, state);
+            Run(isSDK, state);
         }
 
         static void CreateFiles()
@@ -113,7 +115,7 @@ namespace NovetusLauncher
             DiscordRPC.StartDiscord();
         }
 
-        static void Run(string[] args, bool sdk = false, CMDState state = CMDState.CMDOpen)
+        static void Run(bool sdk = false, CMDState state = CMDState.CMDOpen)
         {
             try
             {
@@ -125,7 +127,7 @@ namespace NovetusLauncher
                     {
                         if (state != CMDState.CMDNone)
                         {
-                            NovetusConsole console = new NovetusConsole(args);
+                            NovetusConsole console = new NovetusConsole();
                             GlobalVars.consoleForm = console;
                             console.Show();
                         }