diff --git a/SDL/SDLJoystick.cpp b/SDL/SDLJoystick.cpp
index b09ddd8ade..441a5dfb6d 100644
--- a/SDL/SDLJoystick.cpp
+++ b/SDL/SDLJoystick.cpp
@@ -13,11 +13,7 @@ extern "C" {
 SDLJoystick::SDLJoystick(bool init_SDL ): thread(NULL), running(true) {
 	if (init_SDL)
 	{
-		SDL_Init(SDL_INIT_JOYSTICK | SDL_INIT_VIDEO
-#ifndef _WIN32
-				| SDL_INIT_EVENTTHREAD
-#endif
-				);
+		SDL_Init(SDL_INIT_JOYSTICK | SDL_INIT_VIDEO);
 	}
 	fillMapping();
 
@@ -44,7 +40,7 @@ SDLJoystick::~SDLJoystick(){
 }
 
 void SDLJoystick::startEventLoop(){
-	thread = SDL_CreateThread(SDLJoystickThreadWrapper, static_cast<void *>(this));
+	thread = SDL_CreateThread(SDLJoystickThreadWrapper, "joystick",static_cast<void *>(this));
 }
 
 void SDLJoystick::ProcessInput(SDL_Event &event){
diff --git a/native b/native
index 9a72d5323b..d4014f5f7f 160000
--- a/native
+++ b/native
@@ -1 +1 @@
-Subproject commit 9a72d5323bfafdaf97aec583eefef9e51e0be594
+Subproject commit d4014f5f7f73f3b3774c498ee5a0145752f9a25b