Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

MediaBrowser.Server.Implementations/MediaEncoder/MediaEncoder.cs

@@ -431,6 +431,22 @@ namespace MediaBrowser.Server.Implementations.MediaEncoder
 
             cancellationToken.ThrowIfCancellationRequested();
 
+            if (result.streams != null)
+            {
+                // Normalize aspect ratio if invalid
+                foreach (var stream in result.streams)
+                {
+                    if (string.Equals(stream.display_aspect_ratio, "0:1", StringComparison.OrdinalIgnoreCase))
+                    {
+                        stream.display_aspect_ratio = string.Empty;
+                    }
+                    if (string.Equals(stream.sample_aspect_ratio, "0:1", StringComparison.OrdinalIgnoreCase))
+                    {
+                        stream.sample_aspect_ratio = string.Empty;
+                    }
+                }
+            }
+
             if (extractChapters && !string.IsNullOrEmpty(standardError))
             {
                 AddChapters(result, standardError);

MediaBrowser.ServerApplication/App.xaml.cs

@@ -24,12 +24,27 @@ namespace MediaBrowser.ServerApplication
     /// </summary>
     public partial class App : Application
     {
+        /// <summary>
+        /// The single instance mutex
+        /// </summary>
+        private static Mutex _singleInstanceMutex;
+
         /// <summary>
         /// Defines the entry point of the application.
         /// </summary>
         [STAThread]
         public static void Main()
         {
+            bool createdNew;
+
+            _singleInstanceMutex = new Mutex(true, @"Local\" + typeof(App).Assembly.GetName().Name, out createdNew);
+            
+            if (!createdNew)
+            {
+                _singleInstanceMutex = null;
+                return;
+            }
+
             // Look for the existence of an update archive
             var appPaths = new ServerApplicationPaths();
             var updateArchive = Path.Combine(appPaths.TempUpdatePath, Constants.MbServerPkgName + ".zip");
@@ -66,11 +81,6 @@ namespace MediaBrowser.ServerApplication
             }
         }
 
-        /// <summary>
-        /// The single instance mutex
-        /// </summary>
-        private Mutex SingleInstanceMutex;
-
         /// <summary>
         /// Gets or sets the logger.
         /// </summary>
@@ -107,15 +117,6 @@ namespace MediaBrowser.ServerApplication
         /// <param name="e">A <see cref="T:System.Windows.StartupEventArgs" /> that contains the event data.</param>
         protected override void OnStartup(StartupEventArgs e)
         {
-            bool createdNew;
-            SingleInstanceMutex = new Mutex(true, @"Local\" + GetType().Assembly.GetName().Name, out createdNew);
-            if (!createdNew)
-            {
-                SingleInstanceMutex = null;
-                Shutdown();
-                return;
-            }
-
             AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException;
             LoadKernel();
 
@@ -190,7 +191,10 @@ namespace MediaBrowser.ServerApplication
 
             base.OnExit(e);
 
-            CompositionRoot.Dispose();
+            if (CompositionRoot != null)
+            {
+                CompositionRoot.Dispose();
+            }
         }
 
         /// <summary>
@@ -198,15 +202,15 @@ namespace MediaBrowser.ServerApplication
         /// </summary>
         private void ReleaseMutex()
         {
-            if (SingleInstanceMutex == null)
+            if (_singleInstanceMutex == null)
             {
                 return;
             }
 
-            SingleInstanceMutex.ReleaseMutex();
-            SingleInstanceMutex.Close();
-            SingleInstanceMutex.Dispose();
-            SingleInstanceMutex = null;
+            _singleInstanceMutex.ReleaseMutex();
+            _singleInstanceMutex.Close();
+            _singleInstanceMutex.Dispose();
+            _singleInstanceMutex = null;
         }
 
         /// <summary>

MediaBrowser.ServerApplication/MainWindow.xaml

@@ -10,7 +10,7 @@
         WindowStyle="None" 
         ShowInTaskbar="False">
     <Grid>
-        <tb:TaskbarIcon Name="MbTaskbarIcon" ToolTipText="Media Browser Server">
+        <tb:TaskbarIcon Name="MbTaskbarIcon" ToolTipText="Media Browser Server" IconSource="/Resources/Images/icon.ico">
 
             <tb:TaskbarIcon.ContextMenu>
                 <ContextMenu Background="White">
@@ -35,32 +35,6 @@
                 </ContextMenu>
             </tb:TaskbarIcon.ContextMenu>
 
-            <tb:TaskbarIcon.Style>
-                <Style TargetType="{x:Type tb:TaskbarIcon}">
-                    <Setter Property="IconSource" Value="/Resources/Images/icon.ico" />
-                    <Style.Triggers>
-                        <DataTrigger Binding="{Binding LoadingImageIndex}" Value="1">
-                            <Setter Property="IconSource" Value="/Resources/Images/Loading/1.ico" />
-                        </DataTrigger>
-                        <DataTrigger Binding="{Binding LoadingImageIndex}" Value="2">
-                            <Setter Property="IconSource" Value="/Resources/Images/Loading/2.ico" />
-                        </DataTrigger>
-                        <DataTrigger Binding="{Binding LoadingImageIndex}" Value="3">
-                            <Setter Property="IconSource" Value="/Resources/Images/Loading/3.ico" />
-                        </DataTrigger>
-                        <DataTrigger Binding="{Binding LoadingImageIndex}" Value="4">
-                            <Setter Property="IconSource" Value="/Resources/Images/Loading/4.ico" />
-                        </DataTrigger>
-                        <DataTrigger Binding="{Binding LoadingImageIndex}" Value="5">
-                            <Setter Property="IconSource" Value="/Resources/Images/Loading/5.ico" />
-                        </DataTrigger>
-                        <DataTrigger Binding="{Binding LoadingImageIndex}" Value="6">
-                            <Setter Property="IconSource" Value="/Resources/Images/Loading/6.ico" />
-                        </DataTrigger>
-                    </Style.Triggers>
-                </Style>
-            </tb:TaskbarIcon.Style>
-
         </tb:TaskbarIcon>
     </Grid>
 </Window>

MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj

@@ -333,14 +333,6 @@
     <Resource Include="Resources\Images\mblogoblackfull.png" />
     <Resource Include="Resources\Images\mblogowhitefull.png" />
   </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Resources\Images\Loading\1.ico" />
-    <Resource Include="Resources\Images\Loading\2.ico" />
-    <Resource Include="Resources\Images\Loading\3.ico" />
-    <Resource Include="Resources\Images\Loading\4.ico" />
-    <Resource Include="Resources\Images\Loading\5.ico" />
-    <Resource Include="Resources\Images\Loading\6.ico" />
-  </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include=".NETFramework,Version=v4.5">
       <Visible>False</Visible>