From 03762d0ca3d3259f4524c0570ea03b40843f349d Mon Sep 17 00:00:00 2001
From: Leland Lucius <github@homerow.net>
Date: Sat, 25 Jul 2020 18:47:30 -0500
Subject: [PATCH] AUP3: Fix unopened project file

---
 src/AutoRecoveryDialog.cpp | 29 +++++++++++++++++++++--------
 src/ProjectFileIO.cpp      |  5 +++++
 src/ProjectFileIO.h        |  4 +++-
 src/ProjectFileManager.cpp |  8 ++++++++
 src/ProjectFileManager.h   |  4 +++-
 src/ProjectManager.cpp     |  6 +++---
 6 files changed, 43 insertions(+), 13 deletions(-)

diff --git a/src/AutoRecoveryDialog.cpp b/src/AutoRecoveryDialog.cpp
index 93a3bea51..b5a6bb355 100644
--- a/src/AutoRecoveryDialog.cpp
+++ b/src/AutoRecoveryDialog.cpp
@@ -13,6 +13,7 @@ Paul Licameli split from AutoRecovery.cpp
 #include "ActiveProjects.h"
 #include "FileNames.h"
 #include "ProjectManager.h"
+#include "ProjectFileIO.h"
 #include "ShuttleGui.h"
 #include "widgets/AudacityMessageBox.h"
 #include "widgets/wxPanelWrapper.h"
@@ -35,7 +36,7 @@ enum {
 class AutoRecoveryDialog final : public wxDialogWrapper
 {
 public:
-   AutoRecoveryDialog();
+   AutoRecoveryDialog(AudacityProject *proj);
 
    bool HasRecoverables() const;
    FilePaths GetRecoverables();
@@ -50,6 +51,7 @@ private:
 
    FilePaths mFiles;
    wxListCtrl *mFileList;
+   AudacityProject *mProject;
 
 public:
    DECLARE_EVENT_TABLE()
@@ -61,10 +63,11 @@ BEGIN_EVENT_TABLE(AutoRecoveryDialog, wxDialogWrapper)
    EVT_BUTTON(ID_RECOVER_SELECTED, AutoRecoveryDialog::OnRecoverSelected)
 END_EVENT_TABLE()
 
-AutoRecoveryDialog::AutoRecoveryDialog()
+AutoRecoveryDialog::AutoRecoveryDialog(AudacityProject *project)
 :  wxDialogWrapper(nullptr, wxID_ANY, XO("Automatic Crash Recovery"),
                    wxDefaultPosition, wxDefaultSize,
-                   wxDEFAULT_DIALOG_STYLE & (~wxCLOSE_BOX)) // no close box
+                   wxDEFAULT_DIALOG_STYLE & (~wxCLOSE_BOX)), // no close box
+   mProject(project)
 {
    SetName();
    ShuttleGui S(this, eIsCreating);
@@ -138,6 +141,13 @@ void AutoRecoveryDialog::PopulateList()
    wxString pattern = wxT("*.") + FileNames::UnsavedProjectExtension();
    FilePaths files;
 
+   FilePath activeFile;
+   if (mProject)
+   {
+      auto &projectFileIO = ProjectFileIO::Get(*mProject);
+      activeFile = projectFileIO.GetFileName();
+   }
+
 //   wxDir::GetAllFiles(tempdir, &files, pattern, wxDIR_FILES);
 
    FilePaths active = ActiveProjects::GetAll();
@@ -148,12 +158,15 @@ void AutoRecoveryDialog::PopulateList()
    for (auto file : active)
    {
       wxFileName fn = file;
-      if (fn.FileExists())
+      if (fn != activeFile)
       {
-         FilePath fullPath = fn.GetFullPath();
-         if (files.Index(fullPath) == wxNOT_FOUND)
+         if (fn.FileExists())
          {
-            files.push_back(fullPath);
+            FilePath fullPath = fn.GetFullPath();
+            if (files.Index(fullPath) == wxNOT_FOUND)
+            {
+               files.push_back(fullPath);
+            }
          }
       }
    }
@@ -333,7 +346,7 @@ bool ShowAutoRecoveryDialogIfNeeded(AudacityProject **pproj, bool *didRecoverAny
    // This must be done before "dlg" is declared.
    wxEventLoopBase::GetActive()->YieldFor(wxEVT_CATEGORY_UI);
 
-   AutoRecoveryDialog dialog;
+   AutoRecoveryDialog dialog(*pproj);
 
    if (dialog.HasRecoverables())
    {
diff --git a/src/ProjectFileIO.cpp b/src/ProjectFileIO.cpp
index ba4161488..c00763f45 100644
--- a/src/ProjectFileIO.cpp
+++ b/src/ProjectFileIO.cpp
@@ -256,6 +256,11 @@ ProjectFileIO::~ProjectFileIO()
 {
 }
 
+bool ProjectFileIO::OpenProject()
+{
+   return OpenConnection();
+}
+
 sqlite3 *ProjectFileIO::DB()
 {
    auto &curConn = CurrConn();
diff --git a/src/ProjectFileIO.h b/src/ProjectFileIO.h
index 3a0c8eed9..704b92aa0 100644
--- a/src/ProjectFileIO.h
+++ b/src/ProjectFileIO.h
@@ -78,11 +78,13 @@ public:
    bool AutoSave(bool recording = false);
    bool AutoSaveDelete(sqlite3 *db = nullptr);
 
+   bool OpenProject();
+   bool CloseProject();
+
    bool ImportProject(const FilePath &fileName);
    bool LoadProject(const FilePath &fileName);
    bool SaveProject(const FilePath &fileName);
    bool SaveCopy(const FilePath& fileName);
-   bool CloseProject();
 
    wxLongLong GetFreeDiskSpace();
 
diff --git a/src/ProjectFileManager.cpp b/src/ProjectFileManager.cpp
index 719eb7a49..e152aae81 100644
--- a/src/ProjectFileManager.cpp
+++ b/src/ProjectFileManager.cpp
@@ -704,6 +704,14 @@ void ProjectFileManager::VacuumProject()
    }
 }
 
+bool ProjectFileManager::OpenProject()
+{
+   auto &project = mProject;
+   auto &projectFileIO = ProjectFileIO::Get(project);
+
+   return projectFileIO.OpenProject();
+}
+
 void ProjectFileManager::CloseProject()
 {
    auto &project = mProject;
diff --git a/src/ProjectFileManager.h b/src/ProjectFileManager.h
index bfad5129b..a2601ac5e 100644
--- a/src/ProjectFileManager.h
+++ b/src/ProjectFileManager.h
@@ -50,9 +50,11 @@ public:
    };
    ReadProjectResults ReadProjectFile( const FilePath &fileName );
 
-   void VacuumProject();
+   bool OpenProject();
    void CloseProject();
 
+   void VacuumProject();
+
    bool Save();
    bool SaveAs();
    bool SaveAs(const FilePath &newFileName, bool addToHistory = true);
diff --git a/src/ProjectManager.cpp b/src/ProjectManager.cpp
index 629b08bb2..1960b6f6a 100644
--- a/src/ProjectManager.cpp
+++ b/src/ProjectManager.cpp
@@ -535,9 +535,9 @@ AudacityProject *ProjectManager::New()
    auto &window = ProjectWindow::Get( *p );
    InitProjectWindow( window );
 
-   auto &projectFileIO = ProjectFileIO::Get( *p );
-   projectFileIO.SetProjectTitle();
-   
+   auto &projectFileManager = ProjectFileManager::Get( *p );
+   projectFileManager.OpenProject();
+
    MenuManager::Get( project ).CreateMenusAndCommands( project );
    
    projectHistory.InitialState();