fix crashes at start and exit

GDRETools · Sep 30, 2024 · 2d97210 · 2d97210
1 parent 2f6713d
commit 2d97210
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/utility/gdre_logger.cpp b/utility/gdre_logger.cpp
@@ -6,7 +6,7 @@
 
 bool inGuiMode() {
 	//check if we are in GUI mode
-	if (GDRESettings::get_singleton() && !GDRESettings::get_singleton()->is_headless()) {
+	if (GDRESettings::get_singleton() && !GDRESettings::get_singleton()->is_headless() && GodotREEditor::get_singleton()) {
 		return true;
 	}
 	return false;

diff --git a/utility/gdre_settings.cpp b/utility/gdre_settings.cpp
@@ -157,7 +157,9 @@ void addCompatibilityClasses() {
 
 GDRESettings::GDRESettings() {
 #ifdef TOOLS_ENABLED
-	RenderingServer::get_singleton()->set_warn_on_surface_upgrade(false);
+	if (RenderingServer::get_singleton()) {
+		RenderingServer::get_singleton()->set_warn_on_surface_upgrade(false);
+	}
 #endif
 	singleton = this;
 	gdre_packeddata_singleton = memnew(GDREPackedData);