Merge pull request #2233 from MediaBrowser/dev

update recording dialogs

MediaBrowser.Server.Implementations/EntryPoints/ExternalPortForwarding.cs

@@ -122,43 +122,55 @@ namespace MediaBrowser.Server.Implementations.EntryPoints
 
             var identifier = string.IsNullOrWhiteSpace(usn) ? nt : usn;
 
-            if (info.Location != null && !_usnsHandled.Contains(identifier))
+            if (info.Location == null)
             {
+                return;
+            }
+
+            lock (_usnsHandled)
+            {
+                if (_usnsHandled.Contains(identifier))
+                {
+                    return;
+                }
                 _usnsHandled.Add(identifier);
+            }
 
-                _logger.Debug("Calling Nat.Handle on " + identifier);
+            _logger.Debug("Calling Nat.Handle on " + identifier);
 
-                IPAddress address;
+            IPAddress address;
-                if (IPAddress.TryParse(info.Location.Host, out address))
+            if (IPAddress.TryParse(info.Location.Host, out address))
-                {
+            {
-                    // The Handle method doesn't need the port
+                // The Handle method doesn't need the port
-                    var endpoint = new IPEndPoint(address, info.Location.Port);
+                var endpoint = new IPEndPoint(address, info.Location.Port);
 
-                    IPAddress localAddress = null;
+                IPAddress localAddress = null;
 
-                    try
+                try
-                    {
+                {
-                        var localAddressString = await _appHost.GetLocalApiUrl().ConfigureAwait(false);
+                    var localAddressString = await _appHost.GetLocalApiUrl().ConfigureAwait(false);
 
-                        if (!IPAddress.TryParse(localAddressString, out localAddress))
+                    if (!IPAddress.TryParse(localAddressString, out localAddress))
-                        {
-                            return;
-                        }
-                    }
-                    catch
                     {
                         return;
                     }
-
-                    NatUtility.Handle(localAddress, info, endpoint, NatProtocol.Upnp);
                 }
+                catch
+                {
+                    return;
+                }
+
+                NatUtility.Handle(localAddress, info, endpoint, NatProtocol.Upnp);
             }
         }
 
         private void ClearCreatedRules(object state)
         {
             _createdRules = new List<string>();
-            _usnsHandled = new List<string>();
+            lock (_usnsHandled)
+            {
+                _usnsHandled.Clear();
+            }
         }
 
         void NatUtility_UnhandledException(object sender, UnhandledExceptionEventArgs e)

MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs

@@ -741,7 +741,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV
             {
                 PostPaddingSeconds = Math.Max(config.PostPaddingSeconds, 0),
                 PrePaddingSeconds = Math.Max(config.PrePaddingSeconds, 0),
-                RecordAnyChannel = true,
+                RecordAnyChannel = false,
                 RecordAnyTime = true,
                 RecordNewOnly = true,
 

MediaBrowser.Server.Implementations/LiveTv/TunerHosts/M3uParser.cs

@@ -114,8 +114,8 @@ namespace MediaBrowser.Server.Implementations.LiveTv.TunerHosts
             channel.ImageUrl = FindProperty("tvg-logo", extInf, null);
             channel.Number = FindProperty("channel-id", extInf, channel.Number);
             channel.Number = FindProperty("tvg-id", extInf, channel.Number);
-            channel.Name = FindProperty("tvg-name", extInf, channel.Name);
             channel.Name = FindProperty("tvg-id", extInf, channel.Name);
+            channel.Name = FindProperty("tvg-name", extInf, channel.Name);
             return channel;
 
         }

MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj

@@ -515,9 +515,6 @@
     <Content Include="dashboard-ui\scripts\photos.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\scripts\registrationservices.js">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <Content Include="dashboard-ui\scripts\reports.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>