From 52060ceb032aa984d9858c90913b6132a6387f29 Mon Sep 17 00:00:00 2001
From: Rodrigo Braz Monteiro <zeratul@cellosoft.com>
Date: Tue, 23 Jan 2007 00:38:59 +0000
Subject: [PATCH] Video will now load without an available subtitles provider.

Originally committed to SVN as r880.
---
 aegisub/video_context.cpp  | 10 +++++++---
 aegisub/video_provider.cpp |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/aegisub/video_context.cpp b/aegisub/video_context.cpp
index 2339fde76..4eb4f6eeb 100644
--- a/aegisub/video_context.cpp
+++ b/aegisub/video_context.cpp
@@ -247,11 +247,15 @@ void VideoContext::SetVideo(const wxString &filename) {
 
 			// Choose a provider
 			provider = VideoProviderFactory::GetProvider(filename,overFps);
+			loaded = provider != NULL;
 
 			// Get subtitles provider
-			subsProvider = provider->GetAsSubtitlesProvider();
-			if (!subsProvider) subsProvider = SubtitlesProviderFactory::GetProvider();
-			loaded = provider != NULL;
+			try {
+				subsProvider = provider->GetAsSubtitlesProvider();
+				if (!subsProvider) subsProvider = SubtitlesProviderFactory::GetProvider();
+			}
+			catch (wxString err) { wxMessageBox(_T("Error while loading subtitles provider: ") + err,_T("Subtitles provider"));	}
+			catch (const wchar_t *err) { wxMessageBox(_T("Error while loading subtitles provider: ") + wxString(err),_T("Subtitles provider"));	}
 
 			// Set frame rate
 			fps = provider->GetFPS();
diff --git a/aegisub/video_provider.cpp b/aegisub/video_provider.cpp
index 447e71d30..8d761a644 100644
--- a/aegisub/video_provider.cpp
+++ b/aegisub/video_provider.cpp
@@ -99,7 +99,7 @@ void VideoProvider::Cache(int n,const AegiVideoFrame frame) {
 	// Cache enabled?
 	if (cacheMax == 0) return;
 
-	// Cache full, remove use frame at front
+	// Cache full, use frame at front
 	if (cache.size() >= cacheMax) {
 		cache.push_back(cache.front());
 		cache.pop_front();