merge

1 files changed, 6 insertions, 16 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/ApplicationLogsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/ApplicationLogsViewVM.cs
index a384c133d..91cc677e0 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/ApplicationLogsViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/ApplicationLogsViewVM.cs
@@ -59,14 +59,14 @@ namespace Tango.MachineStudio.Logging.ViewModels
             }
         }
 
-        private bool _processDebugLogs;
+        private bool _displayDebug;
         /// <summary>
         /// Gets or sets a value indicating whether display debug logs.
         /// </summary>
-        public bool ProcessDebugLogs
+        public bool DisplayDebug
         {
-            get { return _processDebugLogs; }
-            set { _processDebugLogs = value; RaisePropertyChangedAuto(); OnProcessDebugLogsChanged(); }
+            get { return _displayDebug; }
+            set { _displayDebug = value; RaisePropertyChangedAuto(); }
         }
 
         private LogItemBase _selectedLog;
@@ -184,18 +184,6 @@ namespace Tango.MachineStudio.Logging.ViewModels
             _is_debug = LogManager.Categories.Contains(LogCategory.Debug);
         }
 
-        private void OnProcessDebugLogsChanged()
-        {
-            if (ProcessDebugLogs)
-            {
-                LogManager.Categories.Add(LogCategory.Debug);
-            }
-            else
-            {
-                LogManager.Categories.RemoveAll(x => x == LogCategory.Debug);
-            }
-        }
-
         private void ApplyLogsFilter()
         {
             if ((_realTimePaused && _isRealTime) || !_isRealTime)
@@ -216,6 +204,8 @@ namespace Tango.MachineStudio.Logging.ViewModels
 
         private void LogManager_NewLog(object sender, LogItemBase log)
         {
+            if (log.Category == LogCategory.Debug && !DisplayDebug) return;
+
             if (!RealTimePaused)
             {
                 InvokeUI(() =>