From d48ec115789ffcfbc044c3f5b236afa2a717be96 Mon Sep 17 00:00:00 2001
From: Leland Lucius <github@homerow.net>
Date: Mon, 20 Jul 2020 12:51:01 -0500
Subject: [PATCH] AUP3: UP-37 Crash with an empty project

And a bit of cleanup
---
 src/ProjectFileIO.cpp | 58 ++++++++++++++++++++++---------------------
 1 file changed, 30 insertions(+), 28 deletions(-)

diff --git a/src/ProjectFileIO.cpp b/src/ProjectFileIO.cpp
index 277e0ad0f..0d8b256b3 100644
--- a/src/ProjectFileIO.cpp
+++ b/src/ProjectFileIO.cpp
@@ -944,6 +944,11 @@ sqlite3 *ProjectFileIO::CopyTo(const FilePath &destpath,
       }
    }
 
+   // Create the project doc
+   ProjectSerializer doc;
+   WriteXMLHeader(doc);
+   WriteXML(doc, false, tracks);
+
    auto db = DB();
    sqlite3 *destdb = nullptr;
    bool success = false;
@@ -1104,6 +1109,12 @@ sqlite3 *ProjectFileIO::CopyTo(const FilePath &destpath,
    // Ensure attached DB connection gets configured
    Config(destdb, SafeConfig);
 
+   // Write the project doc
+   if (!WriteDoc("project", doc, destdb))
+   {
+      return nullptr;
+   }
+
    // Tell cleanup everything is good to go
    success = true;
 
@@ -1168,8 +1179,8 @@ bool ProjectFileIO::ShouldVacuum(const std::shared_ptr<TrackList> &tracks)
    // Let's make a percentage...should be plenty of head room
    current *= 100;
 
-   wxLogDebug(wxT("used = %lld total = %lld %lld\n"), current, total, current / total);
-   if (current / total > 80)
+   wxLogDebug(wxT("used = %lld total = %lld %lld\n"), current, total, total ? current / total : 0);
+   if (!total || current / total > 80)
    {
       wxLogDebug(wxT("not vacuuming"));
       return false;
@@ -1251,15 +1262,14 @@ void ProjectFileIO::Vacuum(const std::shared_ptr<TrackList> &tracks)
    // Copy the original database to a new database while pruning unused sample blocks
    auto newDB = CopyTo(origName, XO("Compacting project"), true, tracks);
 
-   // Close handle to the original database
+   // Close handle to the original database, even if the copy failed
    CloseDB();
 
-   // Reestablish the original name.  No need to reopen as it will happen later,
-   // if needed.
+   // Reestablish the original name.
    UseConnection(newDB, origName);
 
    // If the copy failed or we aren't able to write the project doc, backout
-   if (!newDB || !WriteDoc("project", doc, newDB))
+   if (!newDB)
    {
       // Close the new database
       sqlite3_close(newDB);
@@ -1270,7 +1280,8 @@ void ProjectFileIO::Vacuum(const std::shared_ptr<TrackList> &tracks)
       // AUD3 warn user somehow
       wxRenameFile(tempName, origName);
 
-      UseConnection(nullptr, origName);
+      // Reopen original file
+      OpenDB(origName);
 
       return;
    }
@@ -2185,18 +2196,20 @@ bool ProjectFileIO::SaveProject(const FilePath &fileName)
       // Install our checkpoint hook
       sqlite3_wal_hook(mDB, CheckpointHook, this);
    }
-
-   ProjectSerializer doc;
-   WriteXMLHeader(doc);
-   WriteXML(doc);
-
-   if (!WriteDoc("project", doc))
+   else
    {
-      return false;
-   }
+      ProjectSerializer doc;
+      WriteXMLHeader(doc);
+      WriteXML(doc);
 
-   // Autosave no longer needed
-   AutoSaveDelete();
+      if (!WriteDoc("project", doc))
+      {
+         return false;
+      }
+
+      // Autosave no longer needed
+      AutoSaveDelete();
+   }
 
    // Reaching this point defines success and all the rest are no-fail
    // operations:
@@ -2227,17 +2240,6 @@ bool ProjectFileIO::SaveCopy(const FilePath& fileName)
       return false;
    }
 
-   ProjectSerializer doc;
-   WriteXMLHeader(doc);
-   WriteXML(doc);
-
-   // Write the project doc to the new DB
-   if (!WriteDoc("project", doc, db))
-   {
-      wxRemoveFile(fileName);
-      return false;
-   }
-
    // All good...close the database
    (void) sqlite3_close(db);