maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #54443 from briansemrau/threadsafe-toast

Browse source 
Make editor toasts threadsafe
This commit is contained in:
Rémi Verschelde 2021-11-01 09:37:11 +01:00 committed by GitHub
parent 0b667e6c27 3d9c5648df
commit efbbd14af3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
editor/editor_toaster.cpp
View file

@ -172,10 +172,11 @@ void EditorToaster::_error_handler(void *p_self, const char *p_func, const char
}
}
if (p_type == ERR_HANDLER_WARNING) {
EditorToaster::get_singleton()->popup_str(err_str, SEVERITY_WARNING, tooltip_str);
Severity severity = (p_type == ERR_HANDLER_WARNING) ? SEVERITY_WARNING : SEVERITY_ERROR;
if (Thread::get_caller_id() != Thread::get_main_id()) {
EditorToaster::get_singleton()->call_deferred(SNAME("popup_str"), err_str, severity, tooltip_str);
} else {
EditorToaster::get_singleton()->popup_str(err_str, SEVERITY_ERROR, tooltip_str);
EditorToaster::get_singleton()->popup_str(err_str, severity, tooltip_str);
}
}
}