fix project folder in autosave-recovered session

https://forum.shotcut.org/t/shotcut-deletes-glaxnimate-files-from- project-directory/44465
mltframework · Jun 1, 2024 · 40f9afa · 40f9afa
1 parent 1309d54
commit 40f9afa
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
@@ -1691,6 +1691,7 @@ bool MainWindow::open(QString url, const Mlt::Properties *properties, bool play,
     if (info.isRelative()) {
         QDir pwd(QDir::currentPath());
         url = pwd.filePath(url);
+        info.setFile(url);
     }
     if (url.endsWith(".mlt") || url.endsWith(".xml")) {
         if (url != untitledFileName()) {
@@ -1764,6 +1765,12 @@ bool MainWindow::open(QString url, const Mlt::Properties *properties, bool play,
 
         setAudioChannels(MLT.audioChannels());
         if (url.endsWith(".mlt") || url.endsWith(".xml")) {
+            if (MLT.producer()->get_int(kShotcutProjectFolder)) {
+                MLT.setProjectFolder(info.absolutePath());
+                ProxyManager::removePending();
+            } else {
+                MLT.setProjectFolder(QString());
+            }
             setVideoModeMenu();
             m_notesDock->setText(MLT.producer()->get(kShotcutProjectNote));
         }

diff --git a/src/mltcontroller.cpp b/src/mltcontroller.cpp
@@ -148,19 +148,12 @@ int Controller::open(const QString &url, const QString &urlToSave, bool skipConv
         }
         updatePreviewProfile();
         setPreviewScale(Settings.playerPreviewScale());
-        if ( url.endsWith(".mlt") ) {
+        if (url.endsWith(".mlt")) {
             // Load the number of audio channels being used when this project was created.
             int channels = newProducer->get_int(kShotcutProjectAudioChannels);
             if (!channels)
                 channels = 2;
             m_audioChannels = channels;
-            if (newProducer->get_int(kShotcutProjectFolder)) {
-                QFileInfo info(url);
-                setProjectFolder(info.absolutePath());
-                ProxyManager::removePending();
-            } else {
-                setProjectFolder(QString());
-            }
         }
         if (Util::isFpsDifferent(profile().fps(), fps) || (Settings.playerGPU()
                                                            && !profile().is_explicit())) {