1 files changed, 16 insertions, 6 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 91cc677e0..a384c133d 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 _displayDebug;
+        private bool _processDebugLogs;
         /// <summary>
         /// Gets or sets a value indicating whether display debug logs.
         /// </summary>
-        public bool DisplayDebug
+        public bool ProcessDebugLogs
         {
-            get { return _displayDebug; }
-            set { _displayDebug = value; RaisePropertyChangedAuto(); }
+            get { return _processDebugLogs; }
+            set { _processDebugLogs = value; RaisePropertyChangedAuto(); OnProcessDebugLogsChanged(); }
         }
 
         private LogItemBase _selectedLog;
@@ -184,6 +184,18 @@ 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)
@@ -204,8 +216,6 @@ namespace Tango.MachineStudio.Logging.ViewModels
 
         private void LogManager_NewLog(object sender, LogItemBase log)
         {
-            if (log.Category == LogCategory.Debug && !DisplayDebug) return;
-
             if (!RealTimePaused)
             {
                 InvokeUI(() =>