anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-19 05:53:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

branch: Fix a crash when removing the label of an included Program Listing.

Browse Source 
See also:
http://www.lyx.org/trac/changeset/28563

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@28570 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Vincent van Ravesteijn 2009-02-20 19:36:19 +00:00
parent c0714cb5be
commit a9e9e03ce9
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/insets/InsetInclude.cpp
View File

@ -243,9 +243,10 @@ void InsetInclude::doDispatch(Cursor & cur, FuncRequest & cmd)
docstring old_label; docstring old_label;
if (label_) if (label_)
old_label = label_->getParam("name"); old_label = label_->getParam("name");
if (new_label.empty()) if (new_label.empty()) {
delete label_; delete label_;
else if (label_ && old_label != new_label) { label_ = 0;
} else if (label_ && old_label != new_label) {
label_->updateCommand(new_label); label_->updateCommand(new_label);
// the label might have been adapted (duplicate) // the label might have been adapted (duplicate)
if (new_label != label_->getParam("name")) { if (new_label != label_->getParam("name")) {

2
status.16x
View File

@ -181,6 +181,8 @@ What's new
- Fix a crash when pressing the Update button of the Citation dialog - Fix a crash when pressing the Update button of the Citation dialog
for read-only documents (bug 5785). for read-only documents (bug 5785).
- Fix a crash when removing the label of an included Program Listing.
- Ignore the master_buffer setting in Document>Settings if the current - Ignore the master_buffer setting in Document>Settings if the current
document is no real child. This fixes a crash when using the outliner document is no real child. This fixes a crash when using the outliner
in such files (bug 5653). in such files (bug 5653).