From 98a792c9fda12a85a46e7207fd03888dcc1dff23 Mon Sep 17 00:00:00 2001 From: Enrico Forestieri Date: Tue, 19 Feb 2019 19:51:11 +0100 Subject: [PATCH] Fix bug #11490 Correctly add the branch name suffix when the stem of the filename contains a dot. (cherry picked from commit c3b950483565ca53265a4105a4946585f8b59e24) --- src/Buffer.cpp | 5 ++--- status.23x | 3 +++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/Buffer.cpp b/src/Buffer.cpp index 354173e8cb..8819689636 100644 --- a/src/Buffer.cpp +++ b/src/Buffer.cpp @@ -824,10 +824,9 @@ FileName Buffer::Impl::exportFileName() const if (branch_suffix.empty()) return filename; - string const name = filename.onlyFileNameWithoutExt() - + to_utf8(branch_suffix); + string const name = addExtension(filename.onlyFileNameWithoutExt() + + to_utf8(branch_suffix), filename.extension()); FileName res(filename.onlyPath().absFileName() + "/" + name); - res.changeExtension(filename.extension()); return res; } diff --git a/status.23x b/status.23x index b55dd8ddfd..5216b09953 100644 --- a/status.23x +++ b/status.23x @@ -97,6 +97,9 @@ What's new - Fix LaTeX error caused by Control key shortcut inset on the Mac (remainder of bug 10641). +- Correctly add the branch name suffix when the stem of the filename + contains a dot (bug 11490). + * USER INTERFACE -- 2.39.5