From e902507e47ce310745efebc37211db4674bc35fc Mon Sep 17 00:00:00 2001 From: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Wed, 15 Dec 2021 19:49:10 -0800 Subject: [PATCH] core: don't open cancelled project load --- app/core.cpp | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/app/core.cpp b/app/core.cpp index 48830651a..c79d11a0a 100644 --- a/app/core.cpp +++ b/app/core.cpp @@ -482,19 +482,21 @@ bool Core::AddOpenProjectFromTask(Task *task) { ProjectLoadBaseTask* load_task = static_cast(task); - Project* project = load_task->GetLoadedProject(); - MainWindowLayoutInfo layout = load_task->GetLoadedLayout(); + if (!load_task->IsCancelled()) { + Project* project = load_task->GetLoadedProject(); + MainWindowLayoutInfo layout = load_task->GetLoadedLayout(); - if (ValidateFootageInLoadedProject(project, load_task->GetFilenameProjectWasSavedAs())) { - AddOpenProject(project); - main_window_->LoadLayout(layout); + if (ValidateFootageInLoadedProject(project, load_task->GetFilenameProjectWasSavedAs())) { + AddOpenProject(project); + main_window_->LoadLayout(layout); - return true; - } else { - delete project; - - return false; + return true; + } else { + delete project; + } } + + return false; } void Core::ImportTaskComplete(Task* task)