From caaafaf7541bb401de157b72bf490507daf51be0 Mon Sep 17 00:00:00 2001
From: UnknownShadow200 <unknownshadow200@gmail.com>
Date: Wed, 18 Nov 2015 13:32:19 +1100
Subject: [PATCH] Fix hotkeys not being removed.

---
 ClassicalSharp/Network/Utils/NetWriter.cs | 4 +++-
 ClassicalSharp/Utils/Options.cs           | 2 ++
 Launcher2/Utils/Client.cs                 | 1 -
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/ClassicalSharp/Network/Utils/NetWriter.cs b/ClassicalSharp/Network/Utils/NetWriter.cs
index d0151a5ea..4639bbbcf 100644
--- a/ClassicalSharp/Network/Utils/NetWriter.cs
+++ b/ClassicalSharp/Network/Utils/NetWriter.cs
@@ -18,7 +18,9 @@ namespace ClassicalSharp {
 			for( int i = 0; i < count; i++ ) {
 				char c = value[i];
 				int cpIndex = 0;
-				if( c >= ' ' && c <= '~' ) {
+				if( c == '&' ) {
+					buffer[index + i] = (byte)'%'; // escape colour codes
+				} else if( c >= ' ' && c <= '~' ) {
 					buffer[index + i] = (byte)c;
 				} else if( (cpIndex = Utils.ControlCharReplacements.IndexOf( c ) ) >= 0 ) {
 					buffer[index + i] = (byte)cpIndex;
diff --git a/ClassicalSharp/Utils/Options.cs b/ClassicalSharp/Utils/Options.cs
index 5dedb0dfd..edc90d0ae 100644
--- a/ClassicalSharp/Utils/Options.cs
+++ b/ClassicalSharp/Utils/Options.cs
@@ -78,6 +78,7 @@ namespace ClassicalSharp {
 		}
 		
 		public static void Set( string key, string value ) {
+			key = key.ToLower();
 			if( value != null ) {
 				OptionsSet[key] = value;
 			} else {
@@ -87,6 +88,7 @@ namespace ClassicalSharp {
 		}
 		
 		public static void Set<T>( string key, T value ) {
+			key = key.ToLower();
 			OptionsSet[key] = value.ToString();
 			HasChanged = true;
 		}
diff --git a/Launcher2/Utils/Client.cs b/Launcher2/Utils/Client.cs
index f949ab07d..20bc41a2e 100644
--- a/Launcher2/Utils/Client.cs
+++ b/Launcher2/Utils/Client.cs
@@ -18,7 +18,6 @@ namespace Launcher2 {
 		
 		public static bool Start( string args ) {
 			Process process = null;
-			Options.Load();
 			string path = Path.Combine( AppDomain.CurrentDomain.BaseDirectory, "ClassicalSharp.exe" );
 			if( !File.Exists( path ) )
 				return false;