From 449d43d22c1d12ce6aa0243fbb4ea94481ff8f4c Mon Sep 17 00:00:00 2001
From: Michael <Michael@some.where>
Date: Tue, 7 Mar 2017 16:13:53 -0500
Subject: [PATCH] Finish user hacking.

---
 ShiftOS.WinForms/HackerCommands.cs  | 9 ++++++---
 ShiftOS.WinForms/WinformsDesktop.cs | 6 ++++--
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/ShiftOS.WinForms/HackerCommands.cs b/ShiftOS.WinForms/HackerCommands.cs
index 7938fd0..7861981 100644
--- a/ShiftOS.WinForms/HackerCommands.cs
+++ b/ShiftOS.WinForms/HackerCommands.cs
@@ -386,12 +386,13 @@ namespace ShiftOS.WinForms
                     Console.WriteLine(pass);
                     Console.WriteLine();
                     Console.WriteLine("--password breached. Operation took " + sw.ElapsedMilliseconds + " milliseconds.");
+                    ServerManager.MessageReceived -= msgReceived;
                 }
                 else if(msg.Name == "user_data_not_found")
                 {
                     Console.WriteLine("--access denied.");
+                    ServerManager.MessageReceived -= msgReceived;
                 }
-                ServerManager.MessageReceived -= msgReceived;
             };
 
             Console.WriteLine("--beginning brute-force attack on " + usr + "@" + sys + "...");
@@ -440,13 +441,14 @@ namespace ShiftOS.WinForms
                     {
                         Console.WriteLine("--access denied.");
                     }
+                    ServerManager.MessageReceived -= msgReceived;
 
                 }
                 else if (msg.Name == "user_data_not_found")
                 {
                     Console.WriteLine("--access denied.");
+                    ServerManager.MessageReceived -= msgReceived;
                 }
-                ServerManager.MessageReceived -= msgReceived;
             };
 
             Console.WriteLine("--contacting multi-user domain...");
@@ -508,12 +510,13 @@ namespace ShiftOS.WinForms
                         Console.WriteLine("--access denied.");
                     }
 
+                    ServerManager.MessageReceived -= msgReceived;
                 }
                 else if (msg.Name == "user_data_not_found")
                 {
                     Console.WriteLine("--access denied.");
+                    ServerManager.MessageReceived -= msgReceived;
                 }
-                ServerManager.MessageReceived -= msgReceived;
             };
 
             Console.WriteLine("--contacting multi-user domain...");
diff --git a/ShiftOS.WinForms/WinformsDesktop.cs b/ShiftOS.WinForms/WinformsDesktop.cs
index a53ae3a..8900a69 100644
--- a/ShiftOS.WinForms/WinformsDesktop.cs
+++ b/ShiftOS.WinForms/WinformsDesktop.cs
@@ -70,8 +70,10 @@ namespace ShiftOS.WinForms
             NotificationDaemon.NotificationRead += () =>
             {
                 //Soon this will pop a balloon note.
-                btnnotifications.Text = "Notifications (" + NotificationDaemon.GetUnreadCount().ToString() + ")";
-
+                this.Invoke(new Action(() =>
+                {
+                    btnnotifications.Text = "Notifications (" + NotificationDaemon.GetUnreadCount().ToString() + ")";
+                }));
             };
 
             this.LocationChanged += (o, a) =>