Moved enabled check for filters

PaciStardust · Mar 24, 2023 · 7780bc0 · 7780bc0
1 parent 29de519
commit 7780bc0
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 5 deletions.
diff --git a/OscMultitool/Config.cs b/OscMultitool/Config.cs
@@ -792,9 +792,6 @@ private void UpdateRegex()
 
             internal bool Matches(string compare)
             {
-                if (!Enabled)
-                    return false;
-
                 if (_filterRegex == null)
                     return compare.Contains(_filterString, _ignoreCase ? StringComparison.OrdinalIgnoreCase : StringComparison.Ordinal);
 

diff --git a/OscMultitool/Logger.cs b/OscMultitool/Logger.cs
@@ -80,7 +80,7 @@ private static void Log(LogMessage message)
                     return;
 
                 foreach (var filter in Config.Debug.LogFilters)
-                    if (filter.Matches(message.Message))
+                    if (filter.Enabled && filter.Matches(message.Message))
                         return;
 
                 var messageString = message.ToString().Replace("\n", " ").Replace("\r", "");

diff --git a/OscMultitool/Services/Api/Media.cs b/OscMultitool/Services/Api/Media.cs
@@ -87,7 +87,7 @@ private async static Task UpdateCurrentlyPlayingMedia(GlobalSystemMediaTransport
                 }
 
                 foreach (var filter in Config.Textbox.MediaFilters)
-                    if (filter.Matches(playing))
+                    if (filter.Enabled && filter.Matches(playing))
                     {
                         SetNotification(string.Empty);
                         return;