Fix the zombie toolbar problem (bug #8520)

src/frontends/qt4/GuiView.cpp

@@ -495,7 +495,7 @@ GuiView::GuiView(int id)
 
 	if (lyxrc.allow_geometry_session) {
 		// Now take care of session management.
-		if (restoreLayout())
+		if (restoreLayout(true))
 			return;
 	}
 
@@ -616,7 +616,7 @@ void GuiView::saveUISettings() const
 }
 
 
-bool GuiView::restoreLayout()
+bool GuiView::restoreLayout(bool force_inittoolbars)
 {
 	QSettings settings;
 	settings.beginGroup("views");
@@ -665,7 +665,8 @@ bool GuiView::restoreLayout()
 	if ((dialog = findOrBuild("findreplaceadv", true)))
 		dialog->prepareView();
 
-	if (!restoreState(settings.value("layout").toByteArray(), 0))
+	if (!restoreState(settings.value("layout").toByteArray(), 0)
+	    || force_inittoolbars)
 		initToolbars();
 	updateDialogs();
 	return true;

src/frontends/qt4/GuiView.h

@@ -337,7 +337,7 @@ private:
 	/// Saves the settings of toolbars and all dialogs
 	void saveUISettings() const;
 	///
-	bool restoreLayout();
+	bool restoreLayout(bool force_inittoolbars = false);
 	///
 	GuiToolbar * toolbar(std::string const & name);
 	///

status.20x

@@ -126,6 +126,8 @@ What's new
 - Fix regression in which clicking in the main work area always resets
   the selected format in View -> Source (bug 8411).
 
+- Fix toolbar initialization problems with sessions (bug 8520).
+  
 - When selecting text and then using the menu Insert -> Preview, immediately
   display the preview (bug 8075).