From e587cb8a5d58df9b3ebbbe939db1989bab96d52a Mon Sep 17 00:00:00 2001 From: DeepSOIC Date: Thu, 23 Jul 2015 21:40:30 +0300 Subject: [PATCH] Fix rebase mistake, application startup related Caused docking restore problems, and probably toolbar state restoration too. See post 116 of thread "Test Request: Part Design Workflow" ( http://forum.freecadweb.org/viewtopic.php?f=20&t=11205&start=110#p95619 ) --- src/Gui/Application.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/Gui/Application.cpp b/src/Gui/Application.cpp index ca70ead7f..9e98ca9c8 100644 --- a/src/Gui/Application.cpp +++ b/src/Gui/Application.cpp @@ -1752,7 +1752,7 @@ void Application::runApplication(void) // Call this before showing the main window because otherwise: // 1. it shows a white window for a few seconds which doesn't look nice // 2. the layout of the toolbars is completely broken - //app.activateWorkbench(start.c_str()); + app.activateWorkbench(start.c_str()); // show the main window if (!hidden) { @@ -1784,9 +1784,6 @@ void Application::runApplication(void) SoDebugError::setHandlerCallback( messageHandlerCoin, 0 ); #endif - app.activateWorkbench(start.c_str()); - - Instance->d->startingUp = false;