Trivial fix: escape ampersands in file names before pushing to tab header (#8757)

diff --git a/src/frontends/qt4/GuiWorkArea.cpp b/src/frontends/qt4/GuiWorkArea.cpp
index 049831d58d0dce381c453a9681baf1b9f079e03e..7e4a774d089423e666a0d36a03b3ac61a5c12046 100644 (file)
--- a/src/frontends/qt4/GuiWorkArea.cpp
+++ b/src/frontends/qt4/GuiWorkArea.cpp
@@ -1907,7 +1907,7 @@ void TabWorkArea::updateTabTexts()
        for (It it = paths.begin(); it != paths.end(); ++it) {
                int const tab_index = it->tab();
                Buffer const & buf = workArea(tab_index)->bufferView().buffer();
-               QString tab_text = it->displayString();
+               QString tab_text = it->displayString().replace("&", "&&");
                if (!buf.fileName().empty() && !buf.isClean())
                        tab_text += "*";
                setTabText(tab_index, tab_text);

diff --git a/status.20x b/status.20x
index 8d6624e2de57c6e7a2cccd358bb5fbeae49b4af5..b8e196cf5c7219aceb58d6f70b6451b16a86ccc6 100644 (file)
--- a/status.20x
+++ b/status.20x
@@ -86,6 +86,8 @@ What's new
 
 - Correctly detect python scripts required by the preview mechanism.
 
+- Fix display of file names with apersands in the tab header (bug 8757).
+
 
 * DOCUMENTATION AND LOCALIZATION