4 files changed, 14 insertions, 47 deletions

diff --git a/platform/iphone/godot_view_renderer.mm b/platform/iphone/godot_view_renderer.mm
index 1fc822b457..045fb451f0 100644
--- a/platform/iphone/godot_view_renderer.mm
+++ b/platform/iphone/godot_view_renderer.mm
@@ -44,7 +44,6 @@
 
 @interface GodotViewRenderer ()
 
-@property(assign, nonatomic) BOOL hasFinishedLocaleSetup;
 @property(assign, nonatomic) BOOL hasFinishedProjectDataSetup;
 @property(assign, nonatomic) BOOL hasStartedMain;
 @property(assign, nonatomic) BOOL hasFinishedSetup;
@@ -58,9 +57,8 @@
 		return NO;
 	}
 
-	if (!self.hasFinishedLocaleSetup) {
-		[self setupLocaleAndUUID];
-		return YES;
+	if (!OS::get_singleton()) {
+		exit(0);
 	}
 
 	if (!self.hasFinishedProjectDataSetup) {
@@ -79,33 +77,6 @@
 	return NO;
 }
 
-- (void)setupLocaleAndUUID {
-	self.hasFinishedLocaleSetup = YES;
-
-	if (!OS::get_singleton()) {
-		exit(0);
-	}
-
-	NSString *locale_code = [[NSLocale currentLocale] localeIdentifier];
-	OSIPhone::get_singleton()->set_locale(String::utf8([locale_code UTF8String]));
-
-	NSString *uuid;
-	if ([[UIDevice currentDevice] respondsToSelector:@selector(identifierForVendor)]) {
-		uuid = [UIDevice currentDevice].identifierForVendor.UUIDString;
-	} else {
-		// before iOS 6, so just generate an identifier and store it
-		uuid = [[NSUserDefaults standardUserDefaults] objectForKey:@"identiferForVendor"];
-		if (!uuid) {
-			CFUUIDRef cfuuid = CFUUIDCreate(NULL);
-			uuid = [(NSString *)CFUUIDCreateString(NULL, cfuuid) autorelease];
-			CFRelease(cfuuid);
-			[[NSUserDefaults standardUserDefaults] setObject:uuid forKey:@"identifierForVendor"];
-		}
-	}
-
-	OSIPhone::get_singleton()->set_unique_id(String::utf8([uuid UTF8String]));
-}
-
 - (void)setupProjectData {
 	self.hasFinishedProjectDataSetup = YES;
 
diff --git a/platform/iphone/os_iphone.h b/platform/iphone/os_iphone.h
index f3bde46717..c6f95869ee 100644
--- a/platform/iphone/os_iphone.h
+++ b/platform/iphone/os_iphone.h
@@ -84,8 +84,6 @@ private:
 	virtual void finalize() override;
 
 	String user_data_dir;
-	String unique_id;
-	String locale_code;
 
 	bool is_focused = false;
 
@@ -118,10 +116,8 @@ public:
 	void set_user_data_dir(String p_dir);
 	virtual String get_user_data_dir() const override;
 
-	void set_locale(String p_locale);
 	virtual String get_locale() const override;
 
-	void set_unique_id(String p_id);
 	virtual String get_unique_id() const override;
 
 	virtual void vibrate_handheld(int p_duration_ms = 500) override;
diff --git a/platform/iphone/os_iphone.mm b/platform/iphone/os_iphone.mm
index f0bbbd39ca..a7366ffdec 100644
--- a/platform/iphone/os_iphone.mm
+++ b/platform/iphone/os_iphone.mm
@@ -305,20 +305,20 @@ String OSIPhone::get_user_data_dir() const {
 	return user_data_dir;
 }
 
-void OSIPhone::set_locale(String p_locale) {
-	locale_code = p_locale;
-}
-
 String OSIPhone::get_locale() const {
-	return locale_code;
-}
+	NSString *preferedLanguage = [NSLocale preferredLanguages].firstObject;
+
+	if (preferedLanguage) {
+		return String::utf8([preferedLanguage UTF8String]).replace("-", "_");
+	}
 
-void OSIPhone::set_unique_id(String p_id) {
-	unique_id = p_id;
+	NSString *localeIdentifier = [[NSLocale currentLocale] localeIdentifier];
+	return String::utf8([localeIdentifier UTF8String]).replace("-", "_");
 }
 
 String OSIPhone::get_unique_id() const {
-	return unique_id;
+	NSString *uuid = [UIDevice currentDevice].identifierForVendor.UUIDString;
+	return String::utf8([uuid UTF8String]);
 }
 
 void OSIPhone::vibrate_handheld(int p_duration_ms) {
diff --git a/platform/windows/joypad_windows.cpp b/platform/windows/joypad_windows.cpp
index 65caee3035..d1454c9096 100644
--- a/platform/windows/joypad_windows.cpp
+++ b/platform/windows/joypad_windows.cpp
@@ -146,8 +146,8 @@ bool JoypadWindows::setup_dinput_joypad(const DIDEVICEINSTANCE *instance) {
 	if (have_device(instance->guidInstance) || num == -1)
 		return false;
 
-	d_joypads[joypad_count] = dinput_gamepad();
-	dinput_gamepad *joy = &d_joypads[joypad_count];
+	d_joypads[num] = dinput_gamepad();
+	dinput_gamepad *joy = &d_joypads[num];
 
 	const DWORD devtype = (instance->dwDevType & 0xFF);
 
@@ -171,7 +171,7 @@ bool JoypadWindows::setup_dinput_joypad(const DIDEVICEINSTANCE *instance) {
 	WORD version = 0;
 	sprintf_s(uid, "%04x%04x%04x%04x%04x%04x%04x%04x", type, 0, vendor, 0, product, 0, version, 0);
 
-	id_to_change = joypad_count;
+	id_to_change = num;
 	slider_count = 0;
 
 	joy->di_joy->SetDataFormat(&c_dfDIJoystick2);