* GuiDocument.cpp:

	- update colors before changing branches.

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

diff --git a/src/frontends/qt4/GuiDocument.cpp b/src/frontends/qt4/GuiDocument.cpp
index 60502862a4e8ab2bda4a00aafa68eaff1fcefcce..c88fb7f98e5a5137e27d57aac836308b98a03a93 100644 (file)
--- a/src/frontends/qt4/GuiDocument.cpp
+++ b/src/frontends/qt4/GuiDocument.cpp
@@ -2036,6 +2036,7 @@ void GuiDocument::applyView()
        bp_.footskip = widgetsToLength(m->footskipLE, m->footskipUnit);
        bp_.columnsep = widgetsToLength(m->columnsepLE, m->columnsepUnit);
 
+       // branches
        branchesModule->apply(bp_);
 
        // PDF support
@@ -2642,11 +2643,6 @@ void GuiDocument::dispatchParams()
        // This must come first so that a language change is correctly noticed
        setLanguage();
 
-       // rename branches in the document
-       executeBranchRenaming();
-       // and clear changed branches cache
-       changedBranches_.clear();
-
        // Apply the BufferParams. Note that this will set the base class
        // and then update the buffer's layout.
        dispatch_bufferparams(*this, params(), LFUN_BUFFER_PARAMS_APPLY);
@@ -2690,6 +2686,11 @@ void GuiDocument::dispatchParams()
                dispatch(FuncRequest(LFUN_ALL_INSETS_TOGGLE,
                        "assign branch"));
        }
+       // rename branches in the document
+       executeBranchRenaming();
+       // and clear changed branches cache
+       changedBranches_.clear();
+       
        // Generate the colours requested by indices.
        IndicesList & indiceslist = params().indiceslist();
        if (!indiceslist.empty()) {