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

Don't fallback to default when trying to create a nonexistent CSRI renderer, as that should never happen

Browse source 
Originally committed to SVN as r6698.
This commit is contained in:
Thomas Goyne 2012-04-14 03:17:15 +00:00
parent 77eaedd611
commit 24fde36e7f
1 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
aegisub/src/subtitles_provider_csri.cpp
View file

@ -64,22 +64,15 @@ CSRISubtitlesProvider::CSRISubtitlesProvider(std::string type)
{ {
wxMutexLocker lock(csri_mutex); wxMutexLocker lock(csri_mutex);
csri_rend *cur = NULL; for (csri_rend *cur = csri_renderer_default(); cur; cur = csri_renderer_next(cur)) {
if (type == csri_renderer_info(cur)->name) {
// Select renderer
for (cur = csri_renderer_default(); cur; cur = csri_renderer_next(cur)) {
std::string name(csri_renderer_info(cur)->name);
if (name == type) {
renderer = cur; renderer = cur;
break; break;
} }
} }
// Matching renderer not found, fallback to default
if (!renderer) if (!renderer)
renderer = csri_renderer_default(); throw agi::InternalError("CSRI renderer vanished between initial list and creation?", 0);
if (!renderer)
throw "No CSRI renderer available, cannot show subtitles. Try installing one or switch to another subtitle provider.";
std::string name(csri_renderer_info(renderer)->name); std::string name(csri_renderer_info(renderer)->name);
can_open_mem = (name.find("vsfilter") == name.npos); can_open_mem = (name.find("vsfilter") == name.npos);