oak-team/oak-editor
3
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

core: don't open cancelled project load

Browse Source
This commit is contained in:
itsmattkc
2021-12-15 19:49:10 -08:00
parent ab42396c26
commit e902507e47
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/core.cpp
+12 -10
View File
@@ -482,19 +482,21 @@ bool Core::AddOpenProjectFromTask(Task *task)
{ {
ProjectLoadBaseTask* load_task = static_cast<ProjectLoadBaseTask*>(task); ProjectLoadBaseTask* load_task = static_cast<ProjectLoadBaseTask*>(task);
Project* project = load_task->GetLoadedProject(); if (!load_task->IsCancelled()) {
MainWindowLayoutInfo layout = load_task->GetLoadedLayout(); Project* project = load_task->GetLoadedProject();
MainWindowLayoutInfo layout = load_task->GetLoadedLayout();
if (ValidateFootageInLoadedProject(project, load_task->GetFilenameProjectWasSavedAs())) { if (ValidateFootageInLoadedProject(project, load_task->GetFilenameProjectWasSavedAs())) {
AddOpenProject(project); AddOpenProject(project);
main_window_->LoadLayout(layout); main_window_->LoadLayout(layout);
return true; return true;
} else { } else {
delete project; delete project;
}
return false;
} }
return false;
} }
void Core::ImportTaskComplete(Task* task) void Core::ImportTaskComplete(Task* task)