asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Mono: Workaround to fix 'flushing' errors when building at editor startup

Browse source
This commit is contained in:
Ignacio Etcheverry 2019-02-05 18:51:21 +01:00
parent 16d402147b
commit 4aa4916b11
1 changed files with 25 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
modules/mono/editor/godotsharp_editor.cpp
View file

@ -30,6 +30,7 @@
#include "godotsharp_editor.h" #include "godotsharp_editor.h"
#include "core/message_queue.h"
#include "core/os/os.h" #include "core/os/os.h"
#include "core/project_settings.h" #include "core/project_settings.h"
#include "scene/gui/control.h" #include "scene/gui/control.h"
@ -114,10 +115,33 @@ bool GodotSharpEditor::_create_project_solution() {
void GodotSharpEditor::_make_api_solutions_if_needed() { void GodotSharpEditor::_make_api_solutions_if_needed() {
// I'm sick entirely of ProgressDialog // I'm sick entirely of ProgressDialog
static int attempts_left = 100;
if (MessageQueue::get_singleton()->is_flushing() || !SceneTree::get_singleton()) {
ERR_FAIL_COND(attempts_left == 0); // You've got to be kidding
if (SceneTree::get_singleton()) {
SceneTree::get_singleton()->connect("idle_frame", this, "_make_api_solutions_if_needed", Vector<Variant>());
} else {
call_deferred("_make_api_solutions_if_needed");
}
attempts_left--;
return;
}
// Recursion guard needed because signals don't play well with ProgressDialog either, but unlike
// the message queue, with signals the collateral damage should be minimal in the worst case.
static bool recursion_guard = false; static bool recursion_guard = false;
if (!recursion_guard) { if (!recursion_guard) {
recursion_guard = true; recursion_guard = true;
// Oneshot signals don't play well with ProgressDialog either, so we do it this way instead
SceneTree::get_singleton()->disconnect("idle_frame", this, "_make_api_solutions_if_needed");
_make_api_solutions_if_needed_impl(); _make_api_solutions_if_needed_impl();
recursion_guard = false; recursion_guard = false;
} }
} }
@ -434,7 +458,7 @@ GodotSharpEditor::GodotSharpEditor(EditorNode *p_editor) {
String csproj_path = GodotSharpDirs::get_project_csproj_path(); String csproj_path = GodotSharpDirs::get_project_csproj_path();
if (FileAccess::exists(sln_path) && FileAccess::exists(csproj_path)) { if (FileAccess::exists(sln_path) && FileAccess::exists(csproj_path)) {
// We can't use EditorProgress here. It calls Main::iterarion() and the main loop is not initialized yet. // Defer this task because EditorProgress calls Main::iterarion() and the main loop is not yet initialized.
call_deferred("_make_api_solutions_if_needed"); call_deferred("_make_api_solutions_if_needed");
} else { } else {
bottom_panel_btn->hide(); bottom_panel_btn->hide();