mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-12-24 13:48:59 +00:00
* GuiDocument.cpp:
- clear changedBranches_ cache after branches were changed. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30470 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
6ff96b6a05
commit
201a22b96f
@ -2452,6 +2452,9 @@ void GuiDocument::paramsToDialog()
|
|||||||
// Make sure that the bc is in the INITIAL state
|
// Make sure that the bc is in the INITIAL state
|
||||||
if (bc().policy().buttonStatus(ButtonPolicy::RESTORE))
|
if (bc().policy().buttonStatus(ButtonPolicy::RESTORE))
|
||||||
bc().restore();
|
bc().restore();
|
||||||
|
|
||||||
|
// clear changed branches cache
|
||||||
|
changedBranches_.clear();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -2561,7 +2564,6 @@ bool GuiDocument::initialiseParams(string const &)
|
|||||||
//selected, and that we don't have conflicts. If so, we could
|
//selected, and that we don't have conflicts. If so, we could
|
||||||
//at least pop up a warning.
|
//at least pop up a warning.
|
||||||
paramsToDialog();
|
paramsToDialog();
|
||||||
changedBranches_.clear();
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -2642,6 +2644,8 @@ void GuiDocument::dispatchParams()
|
|||||||
|
|
||||||
// rename branches in the document
|
// rename branches in the document
|
||||||
executeBranchRenaming();
|
executeBranchRenaming();
|
||||||
|
// and clear changed branches cache
|
||||||
|
changedBranches_.clear();
|
||||||
|
|
||||||
// Apply the BufferParams. Note that this will set the base class
|
// Apply the BufferParams. Note that this will set the base class
|
||||||
// and then update the buffer's layout.
|
// and then update the buffer's layout.
|
||||||
|
Loading…
Reference in New Issue
Block a user