Author: vfr
Date: Mon Jan 3 18:18:05 2011
New Revision: 37080
URL: http://www.lyx.org/trac/changeset/37080
Log:
Add an extra safety measure in case we don't find the toolbar settings.
see r37075--r37079.
(I think this commit doesn't need a separate status log message as it fits well
in the one committed in r37079.)
Modified:
lyx-devel/branches/BRANCH_1_6_X/src/frontends/qt4/GuiToolbar.cpp
Modified: lyx-devel/branches/BRANCH_1_6_X/src/frontends/qt4/GuiToolbar.cpp
==============================================================================
--- lyx-devel/branches/BRANCH_1_6_X/src/frontends/qt4/GuiToolbar.cpp Mon Jan
3 18:10:54 2011 (r37079)
+++ lyx-devel/branches/BRANCH_1_6_X/src/frontends/qt4/GuiToolbar.cpp Mon Jan
3 18:18:05 2011 (r37080)
@@ -945,7 +945,17 @@
void GuiToolbar::restoreSession()
{
QSettings settings;
- setVisibility(settings.value(sessionKey() + "/visibility").toInt());
+ int const error_val = -1;
+ int visibility =
+ settings.value(sessionKey() + "/visibility", error_val).toInt();
+ if (visibility == error_val || visibility == 0) {
+ // This should not happen, but in case it does, we use the
defaults
+ LYXERR0("Session settings could not be found!. "
+ "Defaults are used instead");
+ visibility =
+
guiApp->toolbars().defaultVisibility(fromqstr(objectName()));
+ }
+ setVisibility(visibility);
}
