From f939133a3665ed5a48b19dc9063f0b17451c4b4a Mon Sep 17 00:00:00 2001 From: Rodrigo Braz Monteiro Date: Mon, 14 Jan 2008 00:39:19 +0000 Subject: [PATCH] Fixed the issue on #538, although this needs some testing to see if it didn't break timecode loading support. Originally committed to SVN as r1711. --- aegisub/frame_main.cpp | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/aegisub/frame_main.cpp b/aegisub/frame_main.cpp index 7efa7e198..76f4e6f3d 100644 --- a/aegisub/frame_main.cpp +++ b/aegisub/frame_main.cpp @@ -1020,9 +1020,16 @@ void FrameMain::LoadVideo(wxString file,bool autoload) { Freeze(); VideoContext::Get()->Stop(); try { - if (VideoContext::Get()->IsLoaded() && VFR_Output.GetFrameRateType() == VFR && !autoload) { - int result = wxMessageBox(_("You have timecodes loaded currently. Would you like to unload them?"), _("Unload timecodes?"), wxYES_NO, this); - if (result == wxYES) { + if (VideoContext::Get()->IsLoaded()) { + if (VFR_Output.GetFrameRateType() == VFR) { + if (!autoload) { + int result = wxMessageBox(_("You have timecodes loaded currently. Would you like to unload them?"), _("Unload timecodes?"), wxYES_NO, this); + if (result == wxYES) { + VFR_Output.Unload(); + } + } + } + else { VFR_Output.Unload(); } }