From 269a206053f9a269f4601e48d92e1288d6fe44a4 Mon Sep 17 00:00:00 2001
From: Thomas Goyne <plorkyeran@aegisub.org>
Date: Tue, 24 Jul 2012 02:40:29 +0000
Subject: [PATCH] Fix loading linked audio when automatic opening of audio from
 video is enabled

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

diff --git a/aegisub/src/frame_main.cpp b/aegisub/src/frame_main.cpp
index a4ae8685a..8360434dc 100644
--- a/aegisub/src/frame_main.cpp
+++ b/aegisub/src/frame_main.cpp
@@ -683,6 +683,9 @@ void FrameMain::OnSubtitlesOpen() {
 		}
 	}
 
+	if (audioChanged)
+		blockAudioLoad = true;
+
 	// Video
 	if (videoChanged) {
 		context->videoController->SetVideo(curSubsVideo);
@@ -712,6 +715,7 @@ void FrameMain::OnSubtitlesOpen() {
 
 	// Audio
 	if (audioChanged) {
+		blockAudioLoad = false;
 		try {
 			if (!curSubsAudio)
 				context->audioController->CloseAudio();