From 76467584bb9b743baf3c2cc8058d541cd25c69ee Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Fri, 30 Sep 2011 20:43:04 +0000 Subject: [PATCH] Rearrange FrameMain's constructor so that the frame is shown before the updates check and files are loaded. Fixes some ugliness and a bug where the detached video dialog wasn't being parented correctly Originally committed to SVN as r5700. --- aegisub/src/frame_main.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/aegisub/src/frame_main.cpp b/aegisub/src/frame_main.cpp index a963b4df1..bf1afc7b2 100644 --- a/aegisub/src/frame_main.cpp +++ b/aegisub/src/frame_main.cpp @@ -191,8 +191,9 @@ FrameMain::FrameMain (wxArrayString args) StartupLog("Load default file"); context->ass->LoadDefault(); - StartupLog("Load files specified on command line"); - LoadList(args); + StartupLog("Display main window"); + Show(); + SetDisplayMode(1, 1); // Version checker StartupLog("Possibly perform automatic updates check"); @@ -204,9 +205,8 @@ FrameMain::FrameMain (wxArrayString args) PerformVersionCheck(false); - StartupLog("Display main window"); - Show(); - SetDisplayMode(1, 1); + StartupLog("Load files specified on command line"); + LoadList(args); StartupLog("Leaving FrameMain constructor"); }