From fc96f1bd280f823e4811175bb99d3c11c55a3f53 Mon Sep 17 00:00:00 2001
From: Thomas Goyne <plorkyeran@aegisub.org>
Date: Tue, 31 Jan 2012 04:03:44 +0000
Subject: [PATCH] Swallow cancel exceptions thrown from opening audio from the
 script so that unrelated things aren't canceled

Originally committed to SVN as r6403.
---
 aegisub/src/frame_main.cpp | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/aegisub/src/frame_main.cpp b/aegisub/src/frame_main.cpp
index 279f04e0d..db87609d0 100644
--- a/aegisub/src/frame_main.cpp
+++ b/aegisub/src/frame_main.cpp
@@ -660,10 +660,13 @@ void FrameMain::OnSubtitlesOpen() {
 
 		// Audio
 		if (curSubsAudio != context->audioController->GetAudioURL()) {
-			if (!curSubsAudio)
-				context->audioController->CloseAudio();
-			else
-				context->audioController->OpenAudio(curSubsAudio);
+			try {
+				if (!curSubsAudio)
+					context->audioController->CloseAudio();
+				else
+					context->audioController->OpenAudio(curSubsAudio);
+			}
+			catch (agi::UserCancelException const&) { }
 		}
 	}