2 files changed, 3 insertions, 3 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;