fix #150956: saving scores opened by relative pathname from cmdline

musescore · Mar 15, 2018 · 28a54f3 · 28a54f3
1 parent 074d590
commit 28a54f3
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/libmscore/scorefile.cpp b/libmscore/scorefile.cpp
@@ -396,6 +396,7 @@ bool MasterScore::saveFile()
       temp.close();
 
       QString name(info.filePath());
+      QString basename(info.fileName());
       QDir dir(info.path());
       if (!saved()) {
             // if file was already saved in this session
@@ -418,8 +419,8 @@ bool MasterScore::saveFile()
             // step 3
             // rename old file into backup
             //
-            if (dir.exists(name)) {
-                  if (!dir.rename(name, backupName)) {
+            if (dir.exists(basename)) {
+                  if (!dir.rename(basename, backupName)) {
 //                      if (!MScore::noGui)
 //                            QMessageBox::critical(0, tr("Save File"),
 //                               tr("Renaming old file <%1> to backup <%2> failed").arg(name, backupname);
@@ -433,8 +434,8 @@ bool MasterScore::saveFile()
             }
       else {
             // file has previously been saved - remove the old file
-            if (dir.exists(name)) {
-                  if (!dir.remove(name)) {
+            if (dir.exists(basename)) {
+                  if (!dir.remove(basename)) {
 //                      if (!MScore::noGui)
 //                            QMessageBox::critical(0, tr("Save File"),
 //                               tr("Removing old file %1 failed").arg(name));