use default.ui position as fall back value

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15810 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/Toolbars.C b/src/frontends/Toolbars.C
index f03e50a070c347d246d5f7c33c88647b58a17b79..6d644be4c3e1a0946923a1b7894d33cb11ac7634 100644 (file)
--- a/src/frontends/Toolbars.C
+++ b/src/frontends/Toolbars.C
@@ -45,7 +45,10 @@ void Toolbars::initFlags(ToolbarBackend::Toolbar & tbb)
        ToolbarSection::ToolbarInfo & info = LyX::ref().session().toolbars().load(tbb.name);
 
        unsigned int flags = static_cast<unsigned int>(tbb.flags);
-       // remove position
+
+       // Remove default.ui positions. Only when a valid postion is stored 
+       // in the session file the default.ui value will be overwritten
+       unsigned int save = flags;
        TurnOffFlag(TOP);
        TurnOffFlag(BOTTOM);
        TurnOffFlag(RIGHT);
@@ -62,7 +65,8 @@ void Toolbars::initFlags(ToolbarBackend::Toolbar & tbb)
        else if (info.location == ToolbarSection::ToolbarInfo::LEFT)
                TurnOnFlag(LEFT);
        else {
-               TurnOnFlag(TOP);
+               // use setting from default.ui
+               flags = save;
                valid_location = false;
        }