From: Juergen Spitzmueller <spitz@lyx.org>
Date: Sat, 24 Nov 2012 15:46:44 +0000 (+0100)
Subject: Fix splitting of layout string
X-Git-Tag: 2.1.0beta1~1213
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=4b4e9560d11519bee146d52a7b3a0717cc2f7db1;p=lyx.git

Fix splitting of layout string
---

diff --git a/src/insets/InsetArgument.cpp b/src/insets/InsetArgument.cpp
index 80b69e0369..d971a16e3a 100644
--- a/src/insets/InsetArgument.cpp
+++ b/src/insets/InsetArgument.cpp
@@ -95,9 +95,10 @@ void InsetArgument::updateBuffer(ParIterator const & it, UpdateType utype)
 	Layout::LaTeXArgMap::const_iterator const lait =
 			args.find(convert<unsigned int>(name_));
 	if (lait != args.end()) {
-		docstring label;
-		support::rsplit(translateIfPossible((*lait).second.labelstring), label, '|');
-		labelstring_ = label;
+		docstring label = translateIfPossible((*lait).second.labelstring);
+		docstring striplabel;
+		support::rsplit(label, striplabel, '|');
+		labelstring_ = striplabel.empty() ? label: striplabel;
 		tooltip_ = translateIfPossible((*lait).second.tooltip);
 	} else {
 		labelstring_ = _("Unknown Argument");