From a9df544ceeaac984c26ed72ec594fd0e3e169541 Mon Sep 17 00:00:00 2001
From: Niels Martin Hansen <nielsm@aegisub.org>
Date: Thu, 5 Jul 2007 19:08:43 +0000
Subject: [PATCH] More minox fixes (well, maybe) to subs preview

Originally committed to SVN as r1380.
---
 aegisub/subs_preview.cpp            | 7 ++++---
 aegisub/subtitles_provider_csri.cpp | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/aegisub/subs_preview.cpp b/aegisub/subs_preview.cpp
index c56553115..87bdce21a 100644
--- a/aegisub/subs_preview.cpp
+++ b/aegisub/subs_preview.cpp
@@ -90,10 +90,11 @@ void SubtitlesPreview::SetStyle(AssStyle *_style) {
 			delete tmpStyle;
 			return;
 		}
+
+		delete style;
 	}
 
 	// Update
-	delete style;
 	style = tmpStyle;
 	UpdateBitmap();
 }
@@ -149,7 +150,7 @@ void SubtitlesPreview::UpdateBitmap(int w,int h) {
 	}
 
 	// Provider OK
-	if (provider) {
+	if (provider && provider->CanRaster()) {
 		// Generate subtitles
 		AssFile *subs = new AssFile();
 		subs->LoadDefault();
@@ -166,8 +167,8 @@ void SubtitlesPreview::UpdateBitmap(int w,int h) {
 			provider->DrawSubtitles(frame,0.1);
 		}
 		catch (...) {}
-		delete provider;
 	}
+	if (provider) delete provider;
 
 	// Convert frame to bitmap
 	wxMemoryDC dc(*bmp);
diff --git a/aegisub/subtitles_provider_csri.cpp b/aegisub/subtitles_provider_csri.cpp
index fe773ddc5..0f8ac2027 100644
--- a/aegisub/subtitles_provider_csri.cpp
+++ b/aegisub/subtitles_provider_csri.cpp
@@ -143,7 +143,7 @@ void CSRISubtitlesProvider::LoadSubtitles(AssFile *subs) {
 		renderer = csri_renderer_default();
 		if (!renderer) {
 			delete subs;
-			throw _T("No CSRI renderer available. Try installing one or switch to another subtitle provider.");
+			throw _T("No CSRI renderer available, cannot show subtitles. Try installing one or switch to another subtitle provider.");
 		}
 	}