forked from mia/Aegisub
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.
This commit is contained in:
parent
91986412b9
commit
f939133a36
1 changed files with 10 additions and 3 deletions
|
@ -1020,12 +1020,19 @@ void FrameMain::LoadVideo(wxString file,bool autoload) {
|
|||
Freeze();
|
||||
VideoContext::Get()->Stop();
|
||||
try {
|
||||
if (VideoContext::Get()->IsLoaded() && VFR_Output.GetFrameRateType() == VFR && !autoload) {
|
||||
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();
|
||||
}
|
||||
}
|
||||
SetDisplayMode(1,-1);
|
||||
VideoContext::Get()->SetVideo(file);
|
||||
SetDisplayMode(0,-1);
|
||||
|
|
Loading…
Reference in a new issue