Merge branch 'master' into h265

1 files changed, 14 insertions, 3 deletions

diff --git a/Emby.Naming/Common/EpisodeExpression.cs b/Emby.Naming/Common/EpisodeExpression.cs
index fd85bf76a..136d8189d 100644
--- a/Emby.Naming/Common/EpisodeExpression.cs
+++ b/Emby.Naming/Common/EpisodeExpression.cs
@@ -6,17 +6,28 @@ namespace Emby.Naming.Common
     public class EpisodeExpression
     {
         private string _expression;
-        public string Expression { get => _expression;
-            set { _expression = value; _regex = null; } }
+        private Regex _regex;
+
+        public string Expression
+        {
+            get => _expression;
+            set
+            {
+                _expression = value;
+                _regex = null;
+            }
+        }
 
         public bool IsByDate { get; set; }
+
         public bool IsOptimistic { get; set; }
+
         public bool IsNamed { get; set; }
+
         public bool SupportsAbsoluteEpisodeNumbers { get; set; }
 
         public string[] DateTimeFormats { get; set; }
 
-        private Regex _regex;
         public Regex Regex => _regex ?? (_regex = new Regex(Expression, RegexOptions.IgnoreCase | RegexOptions.Compiled));
 
         public EpisodeExpression(string expression, bool byDate)