From bb7964122e12faa25eff0c118ae2ed226d324d60 Mon Sep 17 00:00:00 2001 From: Paul Licameli Date: Mon, 10 Jun 2019 11:40:30 -0400 Subject: [PATCH] Fix windows crash at startup, again... ... The fix done at 2f9322e was undone at 43b1afc because of the unacceptable file dependencies. This fixes it by other means. Make a null check in SetProjectTitle in case it is invoked before ProjectWindow has been constructed; also ensure in ProjectManager::New that it is called at least once after that. --- src/ProjectFileIO.cpp | 5 ++++- src/ProjectManager.cpp | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/ProjectFileIO.cpp b/src/ProjectFileIO.cpp index 5b89ceaf8..a45f031c0 100644 --- a/src/ProjectFileIO.cpp +++ b/src/ProjectFileIO.cpp @@ -103,7 +103,10 @@ void ProjectFileIO::UpdatePrefs() void ProjectFileIO::SetProjectTitle( int number) { auto &project = mProject; - auto &window = GetProjectFrame( project ); + auto pWindow = project.GetFrame(); + if ( !pWindow ) + return; + auto &window = *pWindow; wxString name = project.GetProjectName(); // If we are showing project numbers, then we also explicitly show "" if there diff --git a/src/ProjectManager.cpp b/src/ProjectManager.cpp index c81cb243f..af4c32cb0 100644 --- a/src/ProjectManager.cpp +++ b/src/ProjectManager.cpp @@ -360,6 +360,8 @@ AudacityProject *ProjectManager::New() auto &projectManager = Get( project ); auto &window = ProjectWindow::Get( *p ); window.Init(); + + ProjectFileIO::Get( *p ).SetProjectTitle(); MissingAliasFilesDialog::SetShouldShow(true); MenuManager::Get( project ).CreateMenusAndCommands( project );