[qet] qet/qet: [5936] Fix unwanted restore dialog who appear for the current project

[ Thread Index | Date Index | More lists.tuxfamily.org/qet Archives ]


Revision: 5936
Author:   blacksun
Date:     2019-06-24 19:44:37 +0200 (Mon, 24 Jun 2019)
Log Message:
-----------
Fix unwanted restore dialog who appear for the current project

Modified Paths:
--------------
    trunk/sources/qetapp.cpp

Modified: trunk/sources/qetapp.cpp
===================================================================
--- trunk/sources/qetapp.cpp	2019-06-24 17:05:56 UTC (rev 5935)
+++ trunk/sources/qetapp.cpp	2019-06-24 17:44:37 UTC (rev 5936)
@@ -1787,13 +1787,17 @@
  */
 void QETApp::checkBackupFiles()
 {
-	QList<KAutoSaveFile *> stale_files = KAutoSaveFile::allStaleFiles();
+    QList<KAutoSaveFile *> stale_files = KAutoSaveFile::allStaleFiles();
 
 		//Remove from the list @stale_files, the stales file of opened project
 	const QList<KAutoSaveFile *> sf = stale_files;
-	for (KAutoSaveFile *kasf : sf) {
-        for (QETProject *project : registeredProjects().values()) {
-            if (kasf->managedFile() == QUrl::fromLocalFile(project->filePath())) {
+    for (KAutoSaveFile *kasf : sf)
+    {
+        for (QETProject *project : registeredProjects().values())
+        {
+                //We must to adjust with the flag QUrl::StripTrailingSlash to compar a path formated like the path returned by KAutoSaveFile
+            const QString path = QUrl::fromLocalFile(project->filePath()).adjusted(QUrl::RemoveScheme | QUrl::StripTrailingSlash).path();
+            if (kasf->managedFile() == path) {
 				stale_files.removeOne(kasf);
 			}
 		}
@@ -1811,8 +1815,14 @@
 		text.append(tr("<b>Les fichiers de restauration suivant on été trouvé,<br>"
 					   "Voulez-vous les ouvrir ?</b><br>"));
 	}
-	for(const KAutoSaveFile *kasf : stale_files) {
-		text.append("<br>" + kasf->managedFile().path());
+    for(const KAutoSaveFile *kasf : stale_files)
+    {
+#ifdef Q_OS_WIN
+        //Remove the first character '/' before the name of the drive
+        text.append("<br>" + kasf->managedFile().path().remove(0,1));
+#else
+        text.append("<br>" + kasf->managedFile().path());
+#endif
 	}
 
 		//Open backup file


Mail converted by MHonArc 2.6.19+ http://listengine.tuxfamily.org/