From 79e570e571575e380f4718336112d840f6658083 Mon Sep 17 00:00:00 2001
From: Leonardo Galli <leonardo.galli@bluewin.ch>
Date: Tue, 21 Aug 2018 21:56:49 +0200
Subject: [PATCH] Fixed: Absolutely Required Format Tag modifier being ignored
 when multiple modifiers were present

Fixes #2971
---
 .../.idea.NzbDrone/.idea/contentModel.xml     | 33 +++++++++----------
 .../CustomFormats/FormatTagMatchResult.cs     |  2 +-
 2 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/src/.idea/.idea.NzbDrone/.idea/contentModel.xml b/src/.idea/.idea.NzbDrone/.idea/contentModel.xml
index 7bb9c32d7..5f78a1506 100644
--- a/src/.idea/.idea.NzbDrone/.idea/contentModel.xml
+++ b/src/.idea/.idea.NzbDrone/.idea/contentModel.xml
@@ -1,24 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ContentModelStore">
-    <e p="E:\C++ Projects\Sonarr\_output" t="ExcludeRecursive">
+    <e p="$PROJECT_DIR$/../_output" t="ExcludeRecursive">
       <e p="NzbDrone.Update" t="ExcludeRecursive" />
     </e>
-    <e p="E:\C++ Projects\Sonarr\Logo\1024.png" t="Include" />
-    <e p="E:\C++ Projects\Sonarr\Logo\64.png" t="Include" />
-    <e p="E:\C++ Projects\Sonarr\src" t="IncludeFlat">
+    <e p="$PROJECT_DIR$/../Logo/1024.png" t="Include" />
+    <e p="$PROJECT_DIR$/../Logo/64.png" t="Include" />
+    <e p="$PROJECT_DIR$" t="IncludeFlat">
       <e p=".nuget" t="Include">
         <e p="NuGet.exe" t="Include" />
       </e>
-      <e p="_ReSharper.Caches\ReSharperHost11.NzbDrone.00" t="ExcludeRecursive" />
-      <e p="Common" t="Include">
-        <e p="CodeAnalysisDictionary.xml" t="Include" />
-        <e p="CommonAssemblyInfo.cs" t="Include" />
-        <e p="CommonVersionInfo.cs" t="Include" />
-        <e p="GlobalSuppressions.cs" t="Include" />
-      </e>
+      <e p="_ReSharper.Caches/ReSharperHost12.NzbDrone.00" t="ExcludeRecursive" />
+      <e p="Common/CommonAssemblyInfo.cs" t="Include" />
+      <e p="Common/CommonVersionInfo.cs" t="Include" />
+      <e p="Common/GlobalSuppressions.cs" t="Include" />
       <e p="External" t="Include" />
-      <e p="ExternalModules\CurlSharp\CurlSharp" t="IncludeRecursive">
+      <e p="ExternalModules/CurlSharp/CurlSharp" t="IncludeRecursive">
         <e p="bin" t="ExcludeRecursive" />
         <e p="Callbacks" t="Include">
           <e p="CurlEasyCallbacks.cs" t="Include" />
@@ -70,10 +67,10 @@
         </e>
       </e>
       <e p="Host" t="Include" />
-      <e p="Libraries\MediaInfo\libmediainfo.0.dylib" t="Include" />
-      <e p="Libraries\MediaInfo\MediaInfo.dll" t="Include" />
-      <e p="Libraries\Sqlite\libsqlite3.0.dylib" t="Include" />
-      <e p="Libraries\Sqlite\sqlite3.dll" t="Include" />
+      <e p="Libraries/MediaInfo/libmediainfo.0.dylib" t="Include" />
+      <e p="Libraries/MediaInfo/MediaInfo.dll" t="Include" />
+      <e p="Libraries/Sqlite/libsqlite3.0.dylib" t="Include" />
+      <e p="Libraries/Sqlite/sqlite3.dll" t="Include" />
       <e p="LogentriesCore" t="IncludeRecursive">
         <e p="AsyncLogger.cs" t="Include" />
         <e p="bin" t="ExcludeRecursive" />
@@ -3328,7 +3325,7 @@
       </e>
       <e p="packages" t="ExcludeRecursive" />
       <e p="Platform" t="Include" />
-      <e p="ServiceHelpers\ServiceInstall" t="IncludeRecursive">
+      <e p="ServiceHelpers/ServiceInstall" t="IncludeRecursive">
         <e p="app.config" t="Include" />
         <e p="app.manifest" t="Include" />
         <e p="green_puzzle.ico" t="Include" />
@@ -3340,7 +3337,7 @@
         <e p="ServiceHelper.cs" t="Include" />
         <e p="ServiceInstall.csproj" t="IncludeRecursive" />
       </e>
-      <e p="ServiceHelpers\ServiceUninstall" t="IncludeRecursive">
+      <e p="ServiceHelpers/ServiceUninstall" t="IncludeRecursive">
         <e p="app.config" t="Include" />
         <e p="app.manifest" t="Include" />
         <e p="obj" t="ExcludeRecursive" />
diff --git a/src/NzbDrone.Core/CustomFormats/FormatTagMatchResult.cs b/src/NzbDrone.Core/CustomFormats/FormatTagMatchResult.cs
index 93e1cf602..f17a476aa 100644
--- a/src/NzbDrone.Core/CustomFormats/FormatTagMatchResult.cs
+++ b/src/NzbDrone.Core/CustomFormats/FormatTagMatchResult.cs
@@ -34,7 +34,7 @@ public bool DidMatch
         {
             get
             {
-                return !(Matches.Any(m => m.Key.TagModifier == TagModifier.AbsolutelyRequired && m.Value == false) ||
+                return !(Matches.Any(m => m.Key.TagModifier.HasFlag(TagModifier.AbsolutelyRequired) && m.Value == false) ||
                        Matches.All(m => m.Value == false));
             }
         }