From 1801583ed7b69427d88abed379e169afbb35a6e6 Mon Sep 17 00:00:00 2001
From: Thomas Goyne <plorkyeran@aegisub.org>
Date: Mon, 9 Jan 2012 20:31:47 +0000
Subject: [PATCH] Reload the video when reattaching the video display. Fixes a
 pile of issues and potential crashes

Originally committed to SVN as r6258.
---
 aegisub/src/dialog_detached_video.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/aegisub/src/dialog_detached_video.cpp b/aegisub/src/dialog_detached_video.cpp
index 0100e6e74..57d318e8b 100644
--- a/aegisub/src/dialog_detached_video.cpp
+++ b/aegisub/src/dialog_detached_video.cpp
@@ -105,6 +105,7 @@ void DialogDetachedVideo::OnClose(wxCloseEvent&) {
 	context->videoDisplay = old_display;
 	context->videoSlider = old_slider;
 	OPT_SET("Video/Detached/Enabled")->SetBool(false);
+	context->videoController->Reload();
 	Destroy();
 }
 
@@ -126,6 +127,7 @@ void DialogDetachedVideo::OnVideoOpen() {
 		context->detachedVideo = 0;
 		context->videoDisplay = old_display;
 		context->videoSlider = old_slider;
+		context->videoController->Reload();
 		Destroy();
 	}
 }