From 4d08c22204ab78bedbe63d0f8e6be33fb33acdac Mon Sep 17 00:00:00 2001
From: David Sparer <David.Sparer@pearson.com>
Date: Fri, 3 Feb 2017 11:55:48 -0700
Subject: [PATCH] removed settings for the debug console message writer. it
 will only be included in debug builds

---
 mRemoteV1/App/MessageCollectorSetup.cs    | 15 ++-----
 mRemoteV1/Properties/Settings.Designer.cs | 48 -----------------------
 mRemoteV1/Properties/Settings.settings    | 12 ------
 mRemoteV1/app.config                      | 12 ------
 4 files changed, 3 insertions(+), 84 deletions(-)

diff --git a/mRemoteV1/App/MessageCollectorSetup.cs b/mRemoteV1/App/MessageCollectorSetup.cs
index bb30a1aea..3273a02a0 100644
--- a/mRemoteV1/App/MessageCollectorSetup.cs
+++ b/mRemoteV1/App/MessageCollectorSetup.cs
@@ -19,23 +19,14 @@ namespace mRemoteNG.App
 
         public static void BuildMessageWritersFromSettings(IList<IMessageWriter> messageWriterList)
         {
-            messageWriterList.Add(BuildDebugConsoleMessageWriter());
+#if DEBUG
+            messageWriterList.Add(new DebugConsoleMessageWriter());
+#endif
             messageWriterList.Add(BuildTextLogMessageWriter());
             messageWriterList.Add(BuildNotificationPanelMessageWriter());
             messageWriterList.Add(BuildPopupMessageWriter());
         }
 
-        private static DebugConsoleMessageWriter BuildDebugConsoleMessageWriter()
-        {
-            return new DebugConsoleMessageWriter
-            {
-                PrintDebugMessages = Settings.Default.DebugMessageWriterWriteDebugMsgs,
-                PrintInfoMessages = Settings.Default.DebugMessageWriterWriteInfoMsgs,
-                PrintWarningMessages = Settings.Default.DebugMessageWriterWriteWarningMsgs,
-                PrintErrorMessages = Settings.Default.DebugMessageWriterWriteErrorMsgs
-            };
-        }
-
         private static TextLogMessageWriter BuildTextLogMessageWriter()
         {
             return new TextLogMessageWriter(Logger.Instance)
diff --git a/mRemoteV1/Properties/Settings.Designer.cs b/mRemoteV1/Properties/Settings.Designer.cs
index fa8625597..781c1ba6c 100644
--- a/mRemoteV1/Properties/Settings.Designer.cs
+++ b/mRemoteV1/Properties/Settings.Designer.cs
@@ -2387,54 +2387,6 @@ namespace mRemoteNG {
             }
         }
         
-        [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("True")]
-        public bool DebugMessageWriterWriteDebugMsgs {
-            get {
-                return ((bool)(this["DebugMessageWriterWriteDebugMsgs"]));
-            }
-            set {
-                this["DebugMessageWriterWriteDebugMsgs"] = value;
-            }
-        }
-        
-        [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("True")]
-        public bool DebugMessageWriterWriteInfoMsgs {
-            get {
-                return ((bool)(this["DebugMessageWriterWriteInfoMsgs"]));
-            }
-            set {
-                this["DebugMessageWriterWriteInfoMsgs"] = value;
-            }
-        }
-        
-        [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("True")]
-        public bool DebugMessageWriterWriteWarningMsgs {
-            get {
-                return ((bool)(this["DebugMessageWriterWriteWarningMsgs"]));
-            }
-            set {
-                this["DebugMessageWriterWriteWarningMsgs"] = value;
-            }
-        }
-        
-        [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("True")]
-        public bool DebugMessageWriterWriteErrorMsgs {
-            get {
-                return ((bool)(this["DebugMessageWriterWriteErrorMsgs"]));
-            }
-            set {
-                this["DebugMessageWriterWriteErrorMsgs"] = value;
-            }
-        }
-        
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.DefaultSettingValueAttribute("False")]
diff --git a/mRemoteV1/Properties/Settings.settings b/mRemoteV1/Properties/Settings.settings
index 2f6d9ac0c..ea872bdf9 100644
--- a/mRemoteV1/Properties/Settings.settings
+++ b/mRemoteV1/Properties/Settings.settings
@@ -593,18 +593,6 @@
     <Setting Name="LogFilePath" Type="System.String" Scope="User">
       <Value Profile="(Default)" />
     </Setting>
-    <Setting Name="DebugMessageWriterWriteDebugMsgs" Type="System.Boolean" Scope="User">
-      <Value Profile="(Default)">True</Value>
-    </Setting>
-    <Setting Name="DebugMessageWriterWriteInfoMsgs" Type="System.Boolean" Scope="User">
-      <Value Profile="(Default)">True</Value>
-    </Setting>
-    <Setting Name="DebugMessageWriterWriteWarningMsgs" Type="System.Boolean" Scope="User">
-      <Value Profile="(Default)">True</Value>
-    </Setting>
-    <Setting Name="DebugMessageWriterWriteErrorMsgs" Type="System.Boolean" Scope="User">
-      <Value Profile="(Default)">True</Value>
-    </Setting>
     <Setting Name="TextLogMessageWriterWriteDebugMsgs" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
diff --git a/mRemoteV1/app.config b/mRemoteV1/app.config
index 00b051fc7..f0d09a2ec 100644
--- a/mRemoteV1/app.config
+++ b/mRemoteV1/app.config
@@ -613,18 +613,6 @@
       <setting name="LogFilePath" serializeAs="String">
         <value />
       </setting>
-      <setting name="DebugMessageWriterWriteDebugMsgs" serializeAs="String">
-        <value>True</value>
-      </setting>
-      <setting name="DebugMessageWriterWriteInfoMsgs" serializeAs="String">
-        <value>True</value>
-      </setting>
-      <setting name="DebugMessageWriterWriteWarningMsgs" serializeAs="String">
-        <value>True</value>
-      </setting>
-      <setting name="DebugMessageWriterWriteErrorMsgs" serializeAs="String">
-        <value>True</value>
-      </setting>
       <setting name="TextLogMessageWriterWriteDebugMsgs" serializeAs="String">
         <value>False</value>
       </setting>