From: Kornel Benko <kornel@lyx.org>
Date: Sat, 18 Apr 2020 14:32:24 +0000 (+0200)
Subject: Amend(3) 689f26d2: Add default path to server pipe (cmake build)
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=26fb1c028257dccb254ae423f9802b68225366f4;p=features.git

Amend(3) 689f26d2: Add default path to server pipe (cmake build)

Omit duplicated separators if replacing string '$$User' with actual userdir
---

diff --git a/src/LyXRC.cpp b/src/LyXRC.cpp
index 3b0add1ea6..d5a727327f 100644
--- a/src/LyXRC.cpp
+++ b/src/LyXRC.cpp
@@ -669,9 +669,13 @@ LyXRC::ReturnValues LyXRC::read(Lexer & lexrc, bool check_format)
 			break;
 
 		case RC_SERVERPIPE:
-			if (lexrc.next())
+			if (lexrc.next()) {
+				string userdir = package().user_support().absFileName();
+				if (userdir.back() == '/')
+				  userdir = userdir.substr(0, userdir.size()-1);
 				lyxpipes = subst(os::internal_path(lexrc.getString()), "$$User",
-					package().user_support().absFileName());
+					userdir);
+			}
 			break;
 
 		case RC_CT_ADDITIONS_UNDERLINED: