ShiftOS is a hydra.

You pop one bug off, 2,000 more grow in its place.

5 files changed, 152 insertions, 144 deletions

diff --git a/ShiftOS_TheReturn/AppearanceManager.cs b/ShiftOS_TheReturn/AppearanceManager.cs
index 4c1754e..42642f8 100644
--- a/ShiftOS_TheReturn/AppearanceManager.cs
+++ b/ShiftOS_TheReturn/AppearanceManager.cs
@@ -223,9 +223,9 @@ namespace ShiftOS.Engine
         /// </summary>
         internal static void Exit()
         {
-            OnExit?.Invoke();
             //disconnect from MUD
             ServerManager.Disconnect();
+            Environment.Exit(0);
         }
 
         /// <summary>
diff --git a/ShiftOS_TheReturn/AudioManager.cs b/ShiftOS_TheReturn/AudioManager.cs
index a636497..c50bd24 100644
--- a/ShiftOS_TheReturn/AudioManager.cs
+++ b/ShiftOS_TheReturn/AudioManager.cs
@@ -47,9 +47,12 @@ namespace ShiftOS.Engine
         /// </summary>
         public static void Stop()
         {
-            _out?.Stop();
-            _reader?.Dispose();
-            _out?.Dispose();
+            Desktop.InvokeOnWorkerThread(() =>
+            {
+                _out?.Stop();
+                _reader?.Dispose();
+                _out?.Dispose();
+            });
         }
 
         /// <summary>
diff --git a/ShiftOS_TheReturn/Commands.cs b/ShiftOS_TheReturn/Commands.cs
index dc0b3a2..d622bb9 100644
--- a/ShiftOS_TheReturn/Commands.cs
+++ b/ShiftOS_TheReturn/Commands.cs
@@ -366,7 +366,6 @@ namespace ShiftOS.Engine
         public static bool Shutdown()
         {
             TerminalBackend.InvokeCommand("sos.save");
-            SaveSystem.ShuttingDown = true;
             AppearanceManager.Exit();
             return true;
         }
diff --git a/ShiftOS_TheReturn/SaveSystem.cs b/ShiftOS_TheReturn/SaveSystem.cs
index 31db58a..948f95e 100644
--- a/ShiftOS_TheReturn/SaveSystem.cs
+++ b/ShiftOS_TheReturn/SaveSystem.cs
@@ -52,6 +52,9 @@ namespace ShiftOS.Engine
 
         public static ClientSave CurrentUser { get; set; }
 
+        public static bool Ready = false;
+
+        public static event Action PreDigitalSocietyConnection;
 
         public static Save CurrentSave { get; set; }
 
@@ -118,6 +121,18 @@ namespace ShiftOS.Engine
 
                 Console.WriteLine("[inetd] Connecting to network...");
 
+                Ready = false;
+
+                if (PreDigitalSocietyConnection != null)
+                {
+                    PreDigitalSocietyConnection?.Invoke();
+
+                    while (!Ready)
+                    {
+                        Thread.Sleep(10);
+                    }
+                }
+
                 if (defaultConf.ConnectToMud == true)
                 {
                     bool guidReceived = false;
diff --git a/ShiftOS_TheReturn/TerminalBackend.cs b/ShiftOS_TheReturn/TerminalBackend.cs
index 9c57aa8..086ff40 100644
--- a/ShiftOS_TheReturn/TerminalBackend.cs
+++ b/ShiftOS_TheReturn/TerminalBackend.cs
@@ -213,211 +213,201 @@ namespace ShiftOS.Engine
                                                 {
                                                     if (Shiftorium.UpgradeAttributesUnlocked(method))
                                                     {
-                                                        if (CanRunRemotely(method, isRemote))
+                                                        foreach (var ma in method.GetCustomAttributes(false))
                                                         {
-                                                            foreach (var ma in method.GetCustomAttributes(false))
+                                                            if (ma is Command)
                                                             {
-                                                                if (ma is Command)
+                                                                var cmd = ma as Command;
+                                                                if (text.Split('.')[1] == cmd.name)
                                                                 {
-                                                                    var cmd = ma as Command;
-                                                                    if (text.Split('.')[1] == cmd.name)
+                                                                    if (KernelWatchdog.IsSafe(method))
                                                                     {
-                                                                        if (KernelWatchdog.IsSafe(method))
+                                                                        if (KernelWatchdog.CanRunOffline(method))
                                                                         {
-                                                                            if (KernelWatchdog.CanRunOffline(method))
-                                                                            {
-                                                                                var attr = method.GetCustomAttribute<CommandObsolete>();
+                                                                            var attr = method.GetCustomAttribute<CommandObsolete>();
 
-                                                                                if (attr != null)
+                                                                            if (attr != null)
+                                                                            {
+                                                                                string newcommand = attr.newcommand;
+                                                                                if (attr.warn)
                                                                                 {
-                                                                                    string newcommand = attr.newcommand;
-                                                                                    if (attr.warn)
-                                                                                    {
-                                                                                        Console.WriteLine(Localization.Parse((newcommand == "" ? "{ERROR}" : "{WARN}") + attr.reason, new Dictionary<string, string>() {
+                                                                                    Console.WriteLine(Localization.Parse((newcommand == "" ? "{ERROR}" : "{WARN}") + attr.reason, new Dictionary<string, string>() {
                                                                 {"%newcommand", newcommand}
                                                             }));
-                                                                                    }
-                                                                                    if (newcommand != "")
-                                                                                    {
-                                                                                        // redo the entire process running newcommand
+                                                                                }
+                                                                                if (newcommand != "")
+                                                                                {
+                                                                                    // redo the entire process running newcommand
 
-                                                                                        return RunClient(newcommand, args);
-                                                                                    }
+                                                                                    return RunClient(newcommand, args);
                                                                                 }
+                                                                            }
 
-                                                                                var requiresArgs = method.GetCustomAttributes<RequiresArgument>();
-                                                                                bool error = false;
-                                                                                bool providedusage = false;
+                                                                            var requiresArgs = method.GetCustomAttributes<RequiresArgument>();
+                                                                            bool error = false;
+                                                                            bool providedusage = false;
 
-                                                                                foreach (RequiresArgument argument in requiresArgs)
+                                                                            foreach (RequiresArgument argument in requiresArgs)
+                                                                            {
+                                                                                if (!args.ContainsKey(argument.argument))
                                                                                 {
-                                                                                    if (!args.ContainsKey(argument.argument))
-                                                                                    {
 
-                                                                                        if (!providedusage)
-                                                                                        {
-                                                                                            string usageparse = "{COMMAND_" + ns.name.ToUpper() + "_" + cmd.name.ToUpper() + "_USAGE}";
-                                                                                            if (usageparse == Localization.Parse(usageparse))
-                                                                                                usageparse = "";
-                                                                                            else
-                                                                                                usageparse = Shiftorium.UpgradeInstalled("help_usage") ? Localization.Parse("{ERROR}{USAGE}" + usageparse, new Dictionary<string, string>() {
+                                                                                    if (!providedusage)
+                                                                                    {
+                                                                                        string usageparse = "{COMMAND_" + ns.name.ToUpper() + "_" + cmd.name.ToUpper() + "_USAGE}";
+                                                                                        if (usageparse == Localization.Parse(usageparse))
+                                                                                            usageparse = "";
+                                                                                        else
+                                                                                            usageparse = Shiftorium.UpgradeInstalled("help_usage") ? Localization.Parse("{ERROR}{USAGE}" + usageparse, new Dictionary<string, string>() {
                                                                         {"%ns", ns.name},
                                                                         {"%cmd", cmd.name}
                                                                     }) : "";
 
-                                                                                            Console.WriteLine(usageparse);
+                                                                                        Console.WriteLine(usageparse);
 
-                                                                                            providedusage = true;
-                                                                                        }
-                                                                                        if (Shiftorium.UpgradeInstalled("help_usage"))
-                                                                                        {
-                                                                                            Console.WriteLine(Localization.Parse("{ERROR_ARGUMENT_REQUIRED}", new Dictionary<string, string>() {
+                                                                                        providedusage = true;
+                                                                                    }
+                                                                                    if (Shiftorium.UpgradeInstalled("help_usage"))
+                                                                                    {
+                                                                                        Console.WriteLine(Localization.Parse("{ERROR_ARGUMENT_REQUIRED}", new Dictionary<string, string>() {
                                                                     {"%argument", argument.argument}
                                                                 }));
-                                                                                        }
-                                                                                        else
-                                                                                        {
-                                                                                            Console.WriteLine(Localization.Parse("{ERROR_ARGUMENT_REQUIRED_NO_USAGE}"));
-                                                                                        }
-
-                                                                                        error = true;
                                                                                     }
-                                                                                }
+                                                                                    else
+                                                                                    {
+                                                                                        Console.WriteLine(Localization.Parse("{ERROR_ARGUMENT_REQUIRED_NO_USAGE}"));
+                                                                                    }
 
-                                                                                if (error)
-                                                                                {
-                                                                                    throw new Exception("{ERROR_COMMAND_WRONG}");
+                                                                                    error = true;
                                                                                 }
+                                                                            }
 
-                                                                                try
-                                                                                {
-                                                                                    return (bool)method.Invoke(null, new[] { args });
-                                                                                }
-                                                                                catch (TargetInvocationException e)
-                                                                                {
-                                                                                    Console.WriteLine(Localization.Parse("{ERROR_EXCEPTION_THROWN_IN_METHOD}"));
-                                                                                    Console.WriteLine(e.InnerException.Message);
-                                                                                    Console.WriteLine(e.InnerException.StackTrace);
-                                                                                    return true;
-                                                                                }
-                                                                                catch
-                                                                                {
-                                                                                    return (bool)method.Invoke(null, new object[] { });
-                                                                                }
+                                                                            if (error)
+                                                                            {
+                                                                                throw new Exception("{ERROR_COMMAND_WRONG}");
+                                                                            }
+
+                                                                            try
+                                                                            {
+                                                                                return (bool)method.Invoke(null, new[] { args });
                                                                             }
-                                                                            else
+                                                                            catch (TargetInvocationException e)
                                                                             {
-                                                                                Console.Write("<");
-                                                                                ConsoleEx.Bold = true;
-                                                                                ConsoleEx.ForegroundColor = ConsoleColor.DarkRed;
-                                                                                Console.Write("session_mgr");
-                                                                                ConsoleEx.ForegroundColor = SkinEngine.LoadedSkin.TerminalForeColorCC;
-                                                                                ConsoleEx.Bold = false;
-                                                                                Console.Write(">");
-                                                                                ConsoleEx.Italic = true;
-                                                                                ConsoleEx.ForegroundColor = ConsoleColor.DarkYellow;
-                                                                                Console.WriteLine(" You cannot run this command while disconnected from the multi-user domain..");
+                                                                                Console.WriteLine(Localization.Parse("{ERROR_EXCEPTION_THROWN_IN_METHOD}"));
+                                                                                Console.WriteLine(e.InnerException.Message);
+                                                                                Console.WriteLine(e.InnerException.StackTrace);
                                                                                 return true;
-
+                                                                            }
+                                                                            catch
+                                                                            {
+                                                                                return (bool)method.Invoke(null, new object[] { });
                                                                             }
                                                                         }
                                                                         else
                                                                         {
-                                                                            if (SaveSystem.CurrentUser.Permissions == Objects.UserPermissions.Admin)
-                                                                            {
-                                                                                Infobox.PromptText("Elevate to root mode", "This command cannot be run as a regular user. To run this command, please enter your password to elevate to root mode temporarily.", (pass) =>
-                                                                                {
-                                                                                    if (pass == SaveSystem.CurrentUser.Password)
-                                                                                    {
-                                                                                        KernelWatchdog.EnterKernelMode();
-                                                                                        RunClient(text, args, isRemote);
-                                                                                        KernelWatchdog.LeaveKernelMode();
-                                                                                    }
-                                                                                    else
-                                                                                    {
-                                                                                        Infobox.Show("Access denied.", "You did not type in the correct password.");
-                                                                                    }
-                                                                                }, true);
-                                                                                return true;
-                                                                            }
                                                                             Console.Write("<");
                                                                             ConsoleEx.Bold = true;
                                                                             ConsoleEx.ForegroundColor = ConsoleColor.DarkRed;
-                                                                            Console.Write("watchdog");
+                                                                            Console.Write("session_mgr");
                                                                             ConsoleEx.ForegroundColor = SkinEngine.LoadedSkin.TerminalForeColorCC;
                                                                             ConsoleEx.Bold = false;
                                                                             Console.Write(">");
                                                                             ConsoleEx.Italic = true;
                                                                             ConsoleEx.ForegroundColor = ConsoleColor.DarkYellow;
-                                                                            Console.WriteLine(" You cannot run this command. You do not have permission. Incident reported.");
-                                                                            KernelWatchdog.Log("potential_sys_breach", "user attempted to run kernel mode command " + text + " - watchdog has prevented this, good sir.");
+                                                                            Console.WriteLine(" You cannot run this command while disconnected from the multi-user domain..");
+                                                                            return true;
+
+                                                                        }
+                                                                    }
+                                                                    else
+                                                                    {
+                                                                        if (SaveSystem.CurrentUser.Permissions == Objects.UserPermissions.Admin)
+                                                                        {
+                                                                            Infobox.PromptText("Elevate to root mode", "This command cannot be run as a regular user. To run this command, please enter your password to elevate to root mode temporarily.", (pass) =>
+                                                                            {
+                                                                                if (pass == SaveSystem.CurrentUser.Password)
+                                                                                {
+                                                                                    KernelWatchdog.EnterKernelMode();
+                                                                                    RunClient(text, args, isRemote);
+                                                                                    KernelWatchdog.LeaveKernelMode();
+                                                                                }
+                                                                                else
+                                                                                {
+                                                                                    Infobox.Show("Access denied.", "You did not type in the correct password.");
+                                                                                }
+                                                                            }, true);
                                                                             return true;
                                                                         }
+                                                                        Console.Write("<");
+                                                                        ConsoleEx.Bold = true;
+                                                                        ConsoleEx.ForegroundColor = ConsoleColor.DarkRed;
+                                                                        Console.Write("watchdog");
+                                                                        ConsoleEx.ForegroundColor = SkinEngine.LoadedSkin.TerminalForeColorCC;
+                                                                        ConsoleEx.Bold = false;
+                                                                        Console.Write(">");
+                                                                        ConsoleEx.Italic = true;
+                                                                        ConsoleEx.ForegroundColor = ConsoleColor.DarkYellow;
+                                                                        Console.WriteLine(" You cannot run this command. You do not have permission. Incident reported.");
+                                                                        KernelWatchdog.Log("potential_sys_breach", "user attempted to run kernel mode command " + text + " - watchdog has prevented this, good sir.");
+                                                                        return true;
                                                                     }
                                                                 }
+                                                            }
 
 
-                                                            }
                                                         }
                                                     }
+
                                                     else
                                                     {
-                                                        Console.WriteLine(text + " cannot be ran in a remote session");
+                                                        Console.Write("<");
+                                                        ConsoleEx.Bold = true;
+                                                        ConsoleEx.ForegroundColor = ConsoleColor.DarkRed;
+                                                        Console.Write("session_mgr");
+                                                        ConsoleEx.ForegroundColor = SkinEngine.LoadedSkin.TerminalForeColorCC;
+                                                        ConsoleEx.Bold = false;
+                                                        Console.Write(">");
+                                                        ConsoleEx.Italic = true;
+                                                        ConsoleEx.ForegroundColor = ConsoleColor.DarkYellow;
+                                                        Console.WriteLine(" You cannot run this command while disconnected from the multi-user domain..");
                                                         return true;
-                                                    }
-                                                }
-
-                                            }
 
+                                                    }
 
+                                                }
+                                            } 
                                             else
                                             {
+                                                if (SaveSystem.CurrentUser.Permissions == Objects.UserPermissions.Admin)
+                                                {
+                                                    Infobox.PromptText("Elevate to root mode", "This command cannot be run as a regular user. To run this command, please enter your password to elevate to root mode temporarily.", (pass) =>
+                                                    {
+                                                        if (pass == SaveSystem.CurrentUser.Password)
+                                                        {
+                                                            KernelWatchdog.EnterKernelMode();
+                                                            RunClient(text, args, isRemote);
+                                                            KernelWatchdog.LeaveKernelMode();
+                                                        }
+                                                        else
+                                                        {
+                                                            Infobox.Show("Access denied.", "You did not type in the correct password.");
+                                                        }
+                                                    }, true);
+                                                    return true;
+                                                }
                                                 Console.Write("<");
                                                 ConsoleEx.Bold = true;
                                                 ConsoleEx.ForegroundColor = ConsoleColor.DarkRed;
-                                                Console.Write("session_mgr");
+                                                Console.Write("watchdog");
                                                 ConsoleEx.ForegroundColor = SkinEngine.LoadedSkin.TerminalForeColorCC;
                                                 ConsoleEx.Bold = false;
                                                 Console.Write(">");
                                                 ConsoleEx.Italic = true;
                                                 ConsoleEx.ForegroundColor = ConsoleColor.DarkYellow;
-                                                Console.WriteLine(" You cannot run this command while disconnected from the multi-user domain..");
+                                                Console.WriteLine(" You cannot run this command. You do not have permission. Incident reported.");
+                                                KernelWatchdog.Log("potential_sys_breach", "user attempted to run kernel mode command " + text + " - watchdog has prevented this, good sir.");
                                                 return true;
-
                                             }
-
-                                        }
-                                        else
-                                        {
-                                            if (SaveSystem.CurrentUser.Permissions == Objects.UserPermissions.Admin)
-                                            {
-                                                Infobox.PromptText("Elevate to root mode", "This command cannot be run as a regular user. To run this command, please enter your password to elevate to root mode temporarily.", (pass) =>
-                                                {
-                                                    if (pass == SaveSystem.CurrentUser.Password)
-                                                    {
-                                                        KernelWatchdog.EnterKernelMode();
-                                                        RunClient(text, args, isRemote);
-                                                        KernelWatchdog.LeaveKernelMode();
-                                                    }
-                                                    else
-                                                    {
-                                                        Infobox.Show("Access denied.", "You did not type in the correct password.");
-                                                    }
-                                                }, true);
-                                                return true;
-                                            }
-                                            Console.Write("<");
-                                            ConsoleEx.Bold = true;
-                                            ConsoleEx.ForegroundColor = ConsoleColor.DarkRed;
-                                            Console.Write("watchdog");
-                                            ConsoleEx.ForegroundColor = SkinEngine.LoadedSkin.TerminalForeColorCC;
-                                            ConsoleEx.Bold = false;
-                                            Console.Write(">");
-                                            ConsoleEx.Italic = true;
-                                            ConsoleEx.ForegroundColor = ConsoleColor.DarkYellow;
-                                            Console.WriteLine(" You cannot run this command. You do not have permission. Incident reported.");
-                                            KernelWatchdog.Log("potential_sys_breach", "user attempted to run kernel mode command " + text + " - watchdog has prevented this, good sir.");
-                                            return true;
                                         }
                                     }
                                 }
@@ -429,6 +419,7 @@ namespace ShiftOS.Engine
             }
             return false;
         }
+
         public static void PrintPrompt()
         {
             if (SaveSystem.CurrentSave != null && CurrentUser != null)