Author: vfr
Date: Mon Jan 3 16:56:27 2011
New Revision: 37076
URL: http://www.lyx.org/trac/changeset/37076
Log:
This comment introduced in r37075 was wrong. We should never end up here!
However, it cannot hurt to warn the user and fall back to the defaults in case.
The real cause of bug #7099 is something else (which I will fix soon).
Modified:
lyx-devel/trunk/src/frontends/qt4/GuiToolbar.cpp
Modified: lyx-devel/trunk/src/frontends/qt4/GuiToolbar.cpp
==============================================================================
--- lyx-devel/trunk/src/frontends/qt4/GuiToolbar.cpp Mon Jan 3 15:39:41
2011 (r37075)
+++ lyx-devel/trunk/src/frontends/qt4/GuiToolbar.cpp Mon Jan 3 16:56:27
2011 (r37076)
@@ -330,9 +330,9 @@
int visibility =
settings.value(sessionKey() + "/visibility", error_val).toInt();
if (visibility == error_val || visibility == 0) {
- // The settings have not been found. This can happen when
- // the ui file has changed so that we use the settings from
- // the new ui file rather than the old settings.
+ // This should not happen, but in case we use the defaults
+ LYXERR0("Session settings could not be found!. "
+ "Defaults are used instead");
visibility =
guiApp->toolbars().defaultVisibility(fromqstr(objectName()));
}
