* lyxlayout.C (read): set labelstringappendix_ every time

	labelstring is set (instead of using this value only as a
	fallback) (bug 3351)

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

diff --git a/src/lyxlayout.C b/src/lyxlayout.C
index b81ea994251c7bcc7da7ffffd2770320830d31bd..b5f7223c6e48aaec86550fb5fdaff44f0f7ade29 100644 (file)
--- a/src/lyxlayout.C
+++ b/src/lyxlayout.C
@@ -450,8 +450,10 @@ bool LyXLayout::read(LyXLex & lexrc, LyXTextClass const & tclass)
                        break;
 
                case LT_LABELSTRING:    // label string definition
-                       if (lexrc.next())
+                       if (lexrc.next()) {
                                labelstring_ = trim(lexrc.getDocString());
+                               labelstring_appendix_ = labelstring_;
+                       }
                        break;
 
                case LT_ENDLABELSTRING: // endlabel string definition
@@ -486,8 +488,6 @@ bool LyXLayout::read(LyXLex & lexrc, LyXTextClass const & tclass)
        }
        lexrc.popTable();
 
-       if (labelstring_appendix_.empty())
-               labelstring_appendix_ = labelstring_;
        return error;
 }