autoload setup now only on Android

MeroVinggen · May 13, 2024 · 8120400 · 8120400
1 parent a0fb10a
commit 8120400
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/addons/AndroidInternetConnectionStatePlugin/export_plugin.gd b/addons/AndroidInternetConnectionStatePlugin/export_plugin.gd
@@ -9,11 +9,17 @@ var export_plugin: AndroidInternetConnectionStateClass
 func _enter_tree():
 	export_plugin = load("res://addons/AndroidInternetConnectionStatePlugin/AndroidInternetConnectionStateClass.gd").new(_plugin_name)
 	add_export_plugin(export_plugin)
-	add_autoload_singleton(_plugin_name, "res://addons/AndroidInternetConnectionStatePlugin/export_plugin.gd")
+
+	if OS.get_name() == "Android":
+		add_autoload_singleton(_plugin_name, "res://addons/AndroidInternetConnectionStatePlugin/export_plugin.gd")
+	else:
+		push_warning("AndroidInternetConnectionStatePlugin is available only at Android platform, the autoload has not beed registered")
 
 
 func _exit_tree():
 	remove_export_plugin(export_plugin)
 	export_plugin = null
-	remove_autoload_singleton(_plugin_name)
+
+	if ProjectSettings.has_setting("autoload/" + _plugin_name):
+		remove_autoload_singleton(_plugin_name)
 
diff --git a/project.godot b/project.godot
@@ -15,10 +15,6 @@ run/main_scene="res://example/test.tscn"
 config/features=PackedStringArray("4.2", "Mobile")
 config/icon="res://icon.png"
 
-[autoload]
-
-AndroidInternetConnectionStatePlugin="*res://addons/AndroidInternetConnectionStatePlugin/export_plugin.gd"
-
 [editor_plugins]
 
 enabled=PackedStringArray("res://addons/AndroidInternetConnectionStatePlugin/plugin.cfg")