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).

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37076 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Vincent van Ravesteijn 2011-01-03 15:56:27 +00:00
parent 94ede89c57
commit 46d7462ea7

View File

@ -330,9 +330,9 @@ void GuiToolbar::restoreSession()
int visibility = int visibility =
settings.value(sessionKey() + "/visibility", error_val).toInt(); settings.value(sessionKey() + "/visibility", error_val).toInt();
if (visibility == error_val || visibility == 0) { if (visibility == error_val || visibility == 0) {
// The settings have not been found. This can happen when // This should not happen, but in case we use the defaults
// the ui file has changed so that we use the settings from LYXERR0("Session settings could not be found!. "
// the new ui file rather than the old settings. "Defaults are used instead");
visibility = visibility =
guiApp->toolbars().defaultVisibility(fromqstr(objectName())); guiApp->toolbars().defaultVisibility(fromqstr(objectName()));
} }