Swallow cancel exceptions thrown from opening audio from the script so that unrelated things aren't canceled
Originally committed to SVN as r6403.
This commit is contained in:
parent
f774f21903
commit
fc96f1bd28
1 changed files with 7 additions and 4 deletions
|
@ -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&) { }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue