Merge pull request #33311 from RomanPudashkin/fix_audio_export_cancel_470

[4.7.0] Fix #33259: fix audio export cancellation

Author: RomanPudashkin

src/framework/global/io/internal/filesystem.cpp

@@ -317,13 +317,14 @@ Ret FileSystem::removeFile(const io::path_t& path)
     QFile file(path.toQString());
     if (!file.remove()) {
         // Read-only files prevent directory deletion on Windows, retry with Write permission.
-        LOGW() << "Failed to delete file. Setting write permission and trying again...";
+        LOGW() << "Failed to delete file: " << file.errorString()
+               << "\nSetting write permission and trying again...";
         if (!file.setPermissions(file.permissions() | QFile::WriteUser)) {
-            LOGE() << "Failed to set write permission for file";
+            LOGE() << "Failed to set write permission for file: " << file.errorString();
             return make_ret(Err::FSRemoveError);
         }
         if (!file.remove()) {
-            LOGE() << "Second delete attempt failed";
+            LOGE() << "Second delete attempt failed: " << file.errorString();
             return make_ret(Err::FSRemoveError);
         }
 

src/importexport/audioexport/internal/abstractaudiowriter.cpp

@@ -80,6 +80,7 @@ Ret AbstractAudioWriter::writeList(const INotationPtrList&, io::IODevice&, const
 void AbstractAudioWriter::abort()
 {
     playback()->abortSavingAllSoundTracks();
+    m_writeRet = make_ret(Ret::Code::Cancel);
     m_isCompleted = true;
 }
 

src/project/internal/exportprojectscenario.cpp

@@ -418,7 +418,16 @@ Ret ExportProjectScenario::doExportLoop(const muse::io::path_t& scorePath, std::
 
         if (!ret || outputFile.hasError()) {
             if (ret.code() == static_cast<int>(Ret::Code::Cancel)) {
-                fileSystem()->remove(scorePath);
+                // On Windows, remove() may fail immediately after close()
+                // because the file lock has not been released yet
+                for (int i = 0; i < 10; ++i) {
+                    if (fileSystem()->remove(scorePath)) {
+                        return ret;
+                    }
+
+                    std::this_thread::sleep_for(std::chrono::milliseconds(100));
+                }
+
                 return ret;
             }