3 files changed, 6 insertions, 6 deletions
diff --git a/platform/javascript/os_javascript.cpp b/platform/javascript/os_javascript.cpp
index cc3018716d..6824ed1803 100644
--- a/platform/javascript/os_javascript.cpp
+++ b/platform/javascript/os_javascript.cpp
@@ -970,7 +970,8 @@ bool OS_JavaScript::main_loop_iterate() {
 		}
 	}
 
-	process_joypads();
+	if (emscripten_sample_gamepad_data() == EMSCRIPTEN_RESULT_SUCCESS)
+		process_joypads();
 
 	if (just_exited_fullscreen) {
 		if (window_maximized) {
diff --git a/platform/javascript/os_javascript.h b/platform/javascript/os_javascript.h
index 64148915a5..a9f9e23463 100644
--- a/platform/javascript/os_javascript.h
+++ b/platform/javascript/os_javascript.h
@@ -58,6 +58,7 @@ class OS_JavaScript : public OS_Unix {
 	int last_click_button_index;
 
 	MainLoop *main_loop;
+	int video_driver_index;
 	AudioDriverJavaScript audio_driver_javascript;
 
 	bool idb_available;
@@ -85,8 +86,6 @@ class OS_JavaScript : public OS_Unix {
 
 	static void file_access_close_callback(const String &p_file, int p_flags);
 
-	int video_driver_index;
-
 protected:
 	virtual int get_current_video_driver() const;
 
diff --git a/platform/uwp/export/export.cpp b/platform/uwp/export/export.cpp
index 6f4898c005..4dcb6cf38e 100644
--- a/platform/uwp/export/export.cpp
+++ b/platform/uwp/export/export.cpp
@@ -73,7 +73,7 @@ static const char *uwp_uap_capabilities[] = {
 	"voipCall",
 	NULL
 };
-static const char *uwp_device_capabilites[] = {
+static const char *uwp_device_capabilities[] = {
 	"bluetooth",
 	"location",
 	"microphone",
@@ -841,7 +841,7 @@ class EditorExportUWP : public EditorExportPlatform {
 			}
 			uap++;
 		}
-		const char **device = uwp_device_capabilites;
+		const char **device = uwp_device_capabilities;
 		while (*device) {
 			if ((bool)p_preset->get("capabilities/" + String(*device))) {
 				capabilities_elements += "    <DeviceCapability Name=\"" + String(*device) + "\" />\n";
@@ -1105,7 +1105,7 @@ public:
 			uap++;
 		}
 
-		const char **device = uwp_device_capabilites;
+		const char **device = uwp_device_capabilities;
 		while (*device) {
 			r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "capabilities/" + String(*device).camelcase_to_underscore(false)), false));
 			device++;