diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2016-07-11 00:17:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-11 00:17:54 +0200 |
| commit | 9397458cc0a37f4899a0dba5352a6e045ed123d8 (patch) | |
| tree | ee4b0b0588fdd7c8dbe3a0acabace07f4fe66491 | |
| parent | d37ef5990b229c0fb90c25e884ae6ef42dda5a6c (diff) | |
| parent | 1a1b62748a01928401a344b8c538b59f75706ece (diff) | |
Merge pull request #5634 from vnen/assetlib-map-crash
Fix crash on asset lib install
| -rw-r--r-- | main/main.cpp | 2 | ||||
| -rw-r--r-- | tools/editor/asset_library_editor_plugin.cpp | 3 | ||||
| -rw-r--r-- | tools/editor/editor_asset_installer.cpp | 6 |
3 files changed, 8 insertions, 3 deletions
diff --git a/main/main.cpp b/main/main.cpp index adaebab1d4..aa8540632f 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -1504,6 +1504,8 @@ bool Main::start() { if (project_manager_request || (script=="" && test=="" && game_path=="" && !editor)) { ProjectManager *pmanager = memnew( ProjectManager ); + ProgressDialog *progress_dialog = memnew( ProgressDialog ); + pmanager->add_child(progress_dialog); sml->get_root()->add_child(pmanager); OS::get_singleton()->set_context(OS::CONTEXT_PROJECTMAN); } diff --git a/tools/editor/asset_library_editor_plugin.cpp b/tools/editor/asset_library_editor_plugin.cpp index ee535310bc..f132e94690 100644 --- a/tools/editor/asset_library_editor_plugin.cpp +++ b/tools/editor/asset_library_editor_plugin.cpp @@ -600,7 +600,8 @@ void EditorAssetLibrary::_install_asset() { EditorAssetLibraryItemDownload *d = downloads_hb->get_child(i)->cast_to<EditorAssetLibraryItemDownload>(); if (d && d->get_asset_id() == description->get_asset_id()) { - EditorNode::get_singleton()->show_warning("Download for this asset is already in progress!"); + if (EditorNode::get_singleton() != NULL) + EditorNode::get_singleton()->show_warning("Download for this asset is already in progress!"); return; } } diff --git a/tools/editor/editor_asset_installer.cpp b/tools/editor/editor_asset_installer.cpp index ec36773d8d..b6051886c0 100644 --- a/tools/editor/editor_asset_installer.cpp +++ b/tools/editor/editor_asset_installer.cpp @@ -317,9 +317,11 @@ void EditorAssetInstaller::ok_pressed() { } msg+=failed_files[i]; } - EditorNode::get_singleton()->show_warning(msg); + if (EditorNode::get_singleton() != NULL) + EditorNode::get_singleton()->show_warning(msg); } else { - EditorNode::get_singleton()->show_warning("Package Installed Successfully!","Success!"); + if (EditorNode::get_singleton() != NULL) + EditorNode::get_singleton()->show_warning("Package Installed Successfully!","Success!"); } |