mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-12-14 01:22:33 +00:00
* LyXView.cpp (reloadBuffer):
- adjust r31511 to prevent null pointer. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@31512 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
68141ce03c
commit
89bf8d2c8a
@ -1855,11 +1855,11 @@ void LyXFunc::reloadBuffer()
|
|||||||
Buffer * buf = lyx_view_->loadDocument(filename);
|
Buffer * buf = lyx_view_->loadDocument(filename);
|
||||||
docstring const disp_fn = makeDisplayPath(filename.absFilename());
|
docstring const disp_fn = makeDisplayPath(filename.absFilename());
|
||||||
docstring str;
|
docstring str;
|
||||||
|
if (buf) {
|
||||||
// re-allocate master if necessary
|
// re-allocate master if necessary
|
||||||
if (is_child && theBufferList().isLoaded(master)
|
if (is_child && theBufferList().isLoaded(master)
|
||||||
&& buf->masterBuffer() != master)
|
&& buf->masterBuffer() != master)
|
||||||
buf->setParent(master);
|
buf->setParent(master);
|
||||||
if (buf) {
|
|
||||||
updateLabels(*buf);
|
updateLabels(*buf);
|
||||||
lyx_view_->setBuffer(buf);
|
lyx_view_->setBuffer(buf);
|
||||||
buf->errors("Parse");
|
buf->errors("Parse");
|
||||||
|
Loading…
Reference in New Issue
Block a user