From: Vincent van Ravesteijn <vfr@lyx.org>
Date: Tue, 25 Aug 2009 00:04:47 +0000 (+0000)
Subject: Another fix for r30560.
X-Git-Tag: 2.0.0~5591
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=5a02843ab20fd1524a12c8077f740d475c974a95;p=features.git

Another fix for r30560.

When setLayout() disappeared, also the call to setButtonLabel() disappeared. Now, when changing a Note into a Comment, the button label is no longer updated. This is because labelstring_ is not empty, so the line:

return labelstring_.empty() ? getLayout().labelstring() : labelstring_;

introduced in r30570 has no effect.

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

diff --git a/src/insets/InsetNote.cpp b/src/insets/InsetNote.cpp
index 862f77f88e..89d789c04e 100644
--- a/src/insets/InsetNote.cpp
+++ b/src/insets/InsetNote.cpp
@@ -175,6 +175,7 @@ void InsetNote::doDispatch(Cursor & cur, FuncRequest & cmd)
 
 	case LFUN_INSET_MODIFY:
 		string2params(to_utf8(cmd.argument()), params_);
+		setButtonLabel();
 		break;
 
 	case LFUN_INSET_DIALOG_UPDATE: