mia/Aegisub
1
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

fix: infinite recursion when loading video

Browse source 
In 888be0607f some changes have been made to video_display.cpp which causes infinite recursion: the video display enables video/tool/cross tool when running VideoDisplay::Render() for the first time.
But when setting up the tool, the video box size is changed, which calls VideoDisplay::Render() again. So we need to set the tool BEFORE it modifies the box by "AddSeparator".

Fix wangqr/Aegisub#21

Co-authored-by: Charlie Jiang <cqjjjzr@126.com>
This commit is contained in:
wangqr 2019-09-23 11:54:06 -04:00
parent d708f3ecd8
commit 7c76136726
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/video_display.cpp
View file

@ -409,12 +409,14 @@ void VideoDisplay::SetZoomFromBoxText(wxCommandEvent &) {
} }
void VideoDisplay::SetTool(std::unique_ptr<VisualToolBase> new_tool) { void VideoDisplay::SetTool(std::unique_ptr<VisualToolBase> new_tool) {
// Set the tool first to prevent repeated initialization from VideoDisplay::Render
tool = std::move(new_tool);
// Hide the tool bar first to eliminate unecessary size changes
toolBar->Show(false);
toolBar->ClearTools(); toolBar->ClearTools();
toolBar->AddSeparator(); toolBar->AddSeparator();
toolBar->Realize(); toolBar->Realize();
toolBar->Show(false);
tool = std::move(new_tool);
tool->SetToolbar(toolBar); tool->SetToolbar(toolBar);
// Update size as the new typesetting tool may have changed the subtoolbar size // Update size as the new typesetting tool may have changed the subtoolbar size