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

Swallow cancel exceptions thrown from opening audio from the script so that unrelated things aren't canceled

Browse source 
Originally committed to SVN as r6403.
This commit is contained in:
Thomas Goyne 2012-01-31 04:03:44 +00:00
parent f774f21903
commit fc96f1bd28
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
aegisub/src/frame_main.cpp
View file

@ -660,10 +660,13 @@ void FrameMain::OnSubtitlesOpen() {
// Audio // Audio
if (curSubsAudio != context->audioController->GetAudioURL()) { if (curSubsAudio != context->audioController->GetAudioURL()) {
if (!curSubsAudio) try {
context->audioController->CloseAudio(); if (!curSubsAudio)
else context->audioController->CloseAudio();
context->audioController->OpenAudio(curSubsAudio); else
context->audioController->OpenAudio(curSubsAudio);
}
catch (agi::UserCancelException const&) { }
} }
} }