5 files changed, 11 insertions, 18 deletions
diff --git a/platform/uwp/export/export.cpp b/platform/uwp/export/export.cpp
index a9b26056fc..bef19d80ae 100644
--- a/platform/uwp/export/export.cpp
+++ b/platform/uwp/export/export.cpp
@@ -1032,7 +1032,7 @@ void AppxPackager::finish() {
 		Error err = read_cert_file(certificate_path, certificate_pass, &cert_file);
 
 		if (err != OK) {
-			EditorNode::add_io_error(TTR("Couldn't read the certficate file. Are the path and password both correct?"));
+			EditorNode::add_io_error(TTR("Couldn't read the certificate file. Are the path and password both correct?"));
 			package->close();
 			memdelete(package);
 			package = NULL;
diff --git a/platform/uwp/joypad_uwp.cpp b/platform/uwp/joypad_uwp.cpp
index dd57ed94ae..7860994a79 100644
--- a/platform/uwp/joypad_uwp.cpp
+++ b/platform/uwp/joypad_uwp.cpp
@@ -40,7 +40,7 @@ void JoypadUWP::register_events() {
 			ref new EventHandler<Gamepad ^>(this, &JoypadUWP::OnGamepadRemoved);
 }
 
-uint32_t JoypadUWP::process_controllers(uint32_t p_last_id) {
+void JoypadUWP::process_controllers() {
 
 	for (int i = 0; i < MAX_CONTROLLERS; i++) {
 
@@ -55,23 +55,21 @@ uint32_t JoypadUWP::process_controllers(uint32_t p_last_id) {
 				int button_mask = (int)GamepadButtons::Menu;
 				for (int j = 0; j < 14; j++) {
 
-					p_last_id = input->joy_button(p_last_id, controllers[i].id, j, (int)reading.Buttons & button_mask);
+					input->joy_button(controllers[i].id, j, (int)reading.Buttons & button_mask);
 					button_mask *= 2;
 				}
 
-				p_last_id = input->joy_axis(p_last_id, controllers[i].id, JOY_AXIS_0, axis_correct(reading.LeftThumbstickX));
-				p_last_id = input->joy_axis(p_last_id, controllers[i].id, JOY_AXIS_1, axis_correct(reading.LeftThumbstickY, true));
-				p_last_id = input->joy_axis(p_last_id, controllers[i].id, JOY_AXIS_2, axis_correct(reading.RightThumbstickX));
-				p_last_id = input->joy_axis(p_last_id, controllers[i].id, JOY_AXIS_3, axis_correct(reading.RightThumbstickY, true));
-				p_last_id = input->joy_axis(p_last_id, controllers[i].id, JOY_AXIS_4, axis_correct(reading.LeftTrigger, false, true));
-				p_last_id = input->joy_axis(p_last_id, controllers[i].id, JOY_AXIS_5, axis_correct(reading.RightTrigger, false, true));
+				input->joy_axis(controllers[i].id, JOY_AXIS_0, axis_correct(reading.LeftThumbstickX));
+				input->joy_axis(controllers[i].id, JOY_AXIS_1, axis_correct(reading.LeftThumbstickY, true));
+				input->joy_axis(controllers[i].id, JOY_AXIS_2, axis_correct(reading.RightThumbstickX));
+				input->joy_axis(controllers[i].id, JOY_AXIS_3, axis_correct(reading.RightThumbstickY, true));
+				input->joy_axis(controllers[i].id, JOY_AXIS_4, axis_correct(reading.LeftTrigger, false, true));
+				input->joy_axis(controllers[i].id, JOY_AXIS_5, axis_correct(reading.RightTrigger, false, true));
 
 				break;
 			}
 		}
 	}
-
-	return p_last_id;
 }
 
 JoypadUWP::JoypadUWP() {
diff --git a/platform/uwp/joypad_uwp.h b/platform/uwp/joypad_uwp.h
index e5a961e70e..a2572eae3d 100644
--- a/platform/uwp/joypad_uwp.h
+++ b/platform/uwp/joypad_uwp.h
@@ -37,7 +37,7 @@ ref class JoypadUWP sealed {
 	/* clang-format off */
 internal:
 	void register_events();
-	uint32_t process_controllers(uint32_t p_last_id);
+	void process_controllers();
 	/* clang-format on */
 
 	JoypadUWP();
diff --git a/platform/uwp/os_uwp.cpp b/platform/uwp/os_uwp.cpp
index 19ed2b57a3..907156d280 100644
--- a/platform/uwp/os_uwp.cpp
+++ b/platform/uwp/os_uwp.cpp
@@ -344,15 +344,12 @@ String OSUWP::get_clipboard() const {
 
 void OSUWP::input_event(InputEvent &p_event) {
 
-	p_event.ID = ++last_id;
-
 	input->parse_input_event(p_event);
 
 	if (p_event.type == InputEvent::MOUSE_BUTTON && p_event.mouse_button.pressed && p_event.mouse_button.button_index > 3) {
 
 		//send release for mouse wheel
 		p_event.mouse_button.pressed = false;
-		p_event.ID = ++last_id;
 		input->parse_input_event(p_event);
 	}
 };
@@ -680,7 +677,7 @@ uint64_t OSUWP::get_ticks_usec() const {
 
 void OSUWP::process_events() {
 
-	last_id = joypad->process_controllers(last_id);
+	joypad->process_controllers();
 	process_key_events();
 }
 
@@ -907,7 +904,6 @@ OSUWP::OSUWP() {
 
 	pressrc = 0;
 	old_invalid = true;
-	last_id = 0;
 	mouse_mode = MOUSE_MODE_VISIBLE;
 #ifdef STDOUT_FILE
 	stdo = fopen("stdout.txt", "wb");
diff --git a/platform/uwp/os_uwp.h b/platform/uwp/os_uwp.h
index ebbb8af39c..95b834acc4 100644
--- a/platform/uwp/os_uwp.h
+++ b/platform/uwp/os_uwp.h
@@ -92,7 +92,6 @@ private:
 	bool outside;
 	int old_x, old_y;
 	Point2i center;
-	unsigned int last_id;
 	VisualServer *visual_server;
 	Rasterizer *rasterizer;
 	PhysicsServer *physics_server;