mirror of https://github.com/odrling/Aegisub
Made Aegisub remember whether video was detached or not last time.
Originally committed to SVN as r1691.
This commit is contained in:
parent
d7d66733f0
commit
30fc5aa32f
|
@ -43,6 +43,7 @@
|
||||||
#include "video_context.h"
|
#include "video_context.h"
|
||||||
#include "video_display.h"
|
#include "video_display.h"
|
||||||
#include "frame_main.h"
|
#include "frame_main.h"
|
||||||
|
#include "options.h"
|
||||||
|
|
||||||
|
|
||||||
///////////////
|
///////////////
|
||||||
|
@ -76,6 +77,8 @@ DialogDetachedVideo::DialogDetachedVideo(FrameMain *par)
|
||||||
|
|
||||||
// Update
|
// Update
|
||||||
parent->SetDisplayMode(0,-1);
|
parent->SetDisplayMode(0,-1);
|
||||||
|
Options.SetBool(_T("Detached video"),true);
|
||||||
|
Options.Save();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -109,4 +112,6 @@ void DialogDetachedVideo::OnClose(wxCloseEvent &event) {
|
||||||
Destroy();
|
Destroy();
|
||||||
par->detachedVideo = NULL;
|
par->detachedVideo = NULL;
|
||||||
par->SetDisplayMode(-1,-1);
|
par->SetDisplayMode(-1,-1);
|
||||||
|
Options.SetBool(_T("Detached video"),false);
|
||||||
|
Options.Save();
|
||||||
}
|
}
|
||||||
|
|
|
@ -1066,7 +1066,7 @@ void FrameMain::LoadVideo(wxString file,bool autoload) {
|
||||||
SetDisplayMode(-1,-1);
|
SetDisplayMode(-1,-1);
|
||||||
EditBox->UpdateFrameTiming();
|
EditBox->UpdateFrameTiming();
|
||||||
|
|
||||||
if (!VideoContext::Get()->IsLoaded()) DetachVideo(false);
|
DetachVideo(VideoContext::Get()->IsLoaded() && Options.AsBool(_T("Detached Video")));
|
||||||
Thaw();
|
Thaw();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue