mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity

Fix crash when video loading fails.

Browse source 
Originally committed to SVN as r4705.
This commit is contained in:
Thomas Goyne 2010-07-23 06:40:12 +00:00
parent da0fb8cde7
commit 35e33bd036
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
aegisub/src/video_context.cpp
View file

@ -156,12 +156,8 @@ void VideoContext::SetVideo(const wxString &filename) {
try {
grid->CommitChanges(true);
try {
provider.reset(new ThreadedFrameSource(filename, this), std::mem_fun(&ThreadedFrameSource::End));
videoProvider = provider->GetVideoProvider();
}
catch (wxString err) { wxMessageBox(L"Error while loading video: " + err, L"Video Error"); }
catch (const wchar_t *err) { wxMessageBox(L"Error while loading video: " + wxString(err), L"Video Error"); }
provider.reset(new ThreadedFrameSource(filename, this), std::mem_fun(&ThreadedFrameSource::End));
videoProvider = provider->GetVideoProvider();
keyFrames = videoProvider->GetKeyFrames();
@ -198,7 +194,9 @@ void VideoContext::SetVideo(const wxString &filename) {
UpdateDisplays(true);
}
catch (const wchar_t *e) {
wxMessageBox(e,_T("Error setting video"),wxICON_ERROR | wxOK);
}
catch (const wxString &e) {
wxMessageBox(e,_T("Error setting video"),wxICON_ERROR | wxOK);
}