[Mediaportal-svn] r24915 - trunk/mediaportal/Core/Player/Subtitles

[<tou...@te...>]

Author: tourettes_
Date: 2010-01-30 15:24:29 +0100 (Sat, 30 Jan 2010)
New Revision: 24915

Modified:
   trunk/mediaportal/Core/Player/Subtitles/SubtitleRenderer.cs
Log:
Fixed Mantis issue: 0002673: DVB subtitles can cause a crash when using "remember last active module" option 

Modified: trunk/mediaportal/Core/Player/Subtitles/SubtitleRenderer.cs
===================================================================
--- trunk/mediaportal/Core/Player/Subtitles/SubtitleRenderer.cs	2010-01-30 13:36:49 UTC (rev 24914)
+++ trunk/mediaportal/Core/Player/Subtitles/SubtitleRenderer.cs	2010-01-30 14:24:29 UTC (rev 24915)
@@ -613,20 +613,34 @@
     /// <param name="subtitle"></param>
     private void SetSubtitle(Subtitle subtitle)
     {
-      Log.Debug("SubtitleRenderer: SetSubtitle : " + subtitle.ToString());
+      try
+      {
+        Log.Debug("SubtitleRenderer: SetSubtitle : " + subtitle.ToString());
 
-      // dispose of old subtitle
-      if (subTexture != null)
+        // dispose of old subtitle
+        if (subTexture != null)
+        {
+          subTexture.Dispose();
+          subTexture = null;
+        }
+
+        // set new subtitle
+        if (subtitle != null)
+        {          
+          subTexture = subtitle.texture;
+          currentSubtitle = subtitle;
+
+          if (currentSubtitle.subBitmap != null)
+          {
+            currentSubtitle.subBitmap.Dispose();
+            currentSubtitle.subBitmap = null;
+          }
+        }
+      }
+      catch (Exception e)
       {
-        subTexture.Dispose();
-        subTexture = null;
-      }
-
-      // set new subtitle
-      subTexture = subtitle.texture;
-      currentSubtitle = subtitle;
-      currentSubtitle.subBitmap.Dispose();
-      currentSubtitle.subBitmap = null;
+        Log.Error("SubtitleRenderer: SetSubtitle exception: {0} {1}", e.Message, e.StackTrace);         
+      }      
     }
 
     /// <summary>