Merge 5192300 into 1d8fcec

opencor · Jun 13, 2018 · 6d63abb · 6d63abb
2 parents 1d8fcec + 5192300
commit 6d63abb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/doc/downloads/index.js b/doc/downloads/index.js
@@ -38,7 +38,6 @@ var jsonData = { "versions": [
                      ],
                      "changes": [
                        { "change": "<strong>General:</strong> General: fixed a problem with not being able to start OpenCOR from the system PATH (see issue <a href=\"https://github.com/opencor/opencor/issues/1688\">#1688</a>)." },
-                       { "change": "<strong>Central widget:</strong> fixed an issue with the tab bar shifting when switching tabs <a href=\"https://github.com/opencor/opencor/issues/1691\">#1691</a>)." },
                        { "change": "<strong>Text-based editors:</strong> prevent infinite \"Replace all\" actions (see issue <a href=\"https://github.com/opencor/opencor/issues/1677\">#1677</a>). Sped up our highlight/replace all method (see issue <a href=\"https://github.com/opencor/opencor/issues/1679\">#1679</a>). Now have word-wrap alignment <a href=\"https://github.com/opencor/opencor/issues/1680\">#1680</a>)." },
                        { "change": "<strong>Third-party libraries:</strong> upgraded <a href=\"https://libgit2.github.com/\">libgit2</a> to version 0.27.1 (see issue <a href=\"https://github.com/opencor/opencor/issues/1672\">#1672</a>)." }
                      ]

diff --git a/src/plugins/miscellaneous/Core/src/centralwidget.cpp b/src/plugins/miscellaneous/Core/src/centralwidget.cpp
@@ -692,19 +692,18 @@ void CentralWidget::updateFileTab(int pIndex, bool pIconOnly)
                               fileIsRemote?
                                   QUrl(url).fileName():
                                   QFileInfo(fileName).fileName();
+        QString tabToolTip = fileIsNew?
+                                 tabText:
+                                 fileIsRemote?
+                                     url:
+                                     QDir::toNativeSeparators(fileName);
 
         if (fileManagerInstance->isNewOrModified(fileName))
             tabText += "*";
 
         if (tabText.compare(mFileTabs->tabText(pIndex)))
             mFileTabs->setTabText(pIndex, tabText);
 
-        QString tabToolTip = fileIsNew?
-                                 tabText:
-                                 fileIsRemote?
-                                     url:
-                                     QDir::toNativeSeparators(fileName);
-
         if (tabToolTip.compare(mFileTabs->tabToolTip(pIndex)))
             mFileTabs->setTabToolTip(pIndex, tabToolTip);