Merge pull request #2305 from MarcSabatella/88746-save-fail

fix #88746: unable to save files
musescore · Dec 2, 2015 · 77e980d · 77e980d
2 parents 7321ba6 + dd29b97
commit 77e980d
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/libmscore/scorefile.cpp b/libmscore/scorefile.cpp
@@ -385,6 +385,7 @@ bool Score::saveFile()
       temp.close();
 
       QString name(info.filePath());
+      QDir dir(info.path());
       if (!saved()) {
             // if file was already saved in this session
             // save but don't overwrite backup again
@@ -393,7 +394,6 @@ bool Score::saveFile()
             // step 2
             // remove old backup file if exists
             //
-            QDir dir(info.path());
             QString backupName = QString(".") + info.fileName() + QString(",");
             if (dir.exists(backupName)) {
                   if (!dir.remove(backupName)) {
@@ -421,6 +421,17 @@ bool Score::saveFile()
             SetFileAttributes((LPCTSTR)backupNativePath.toLocal8Bit(), FILE_ATTRIBUTE_HIDDEN);
 #endif
             }
+      else {
+            // file has previously been saved - remove the old file
+            if (dir.exists(name)) {
+                  if (!dir.remove(name)) {
+//                      if (!MScore::noGui)
+//                            QMessageBox::critical(0, tr("MuseScore: Save File"),
+//                               tr("Removing old file") + name + tr(" failed"));
+                        }
+                  }
+            }
+
       //
       // step 4
       // rename temp name into file name