Merge branch 'Ryubing:master' into master

Move the section after the check for empty guid (dumb me)

src/Ryujinx.Input.SDL2/SDL2GamepadDriver.cs

@@ -57,16 +57,19 @@ namespace Ryujinx.Input.SDL2
                 return null;
             }
 
+            // Remove the first 4 char of the guid (CRC part) to make it stable
+            string guidString = "0000" + guid.ToString().Substring(4);
+
             string id;
 
             lock (_lock)
             {
                 int guidIndex = 0;
-                id = guidIndex + "-" + guid;
+                id = guidIndex + "-" + guidString;
 
                 while (_gamepadsIds.Contains(id))
                 {
-                    id = (++guidIndex) + "-" + guid;
+                    id = (++guidIndex) + "-" + guidString;
                 }
             }
 

src/Ryujinx/UI/Windows/GameSpecificSettingsWindow.axaml

@@ -13,7 +13,7 @@
     xmlns:helper="clr-namespace:Ryujinx.Common.Helper;assembly=Ryujinx.Common"
     Width="1100"
     Height="910"
-    MinWidth="800"
+    MinWidth="1037"
     MinHeight="480"
     WindowStartupLocation="CenterOwner"
     x:DataType="viewModels:SettingsViewModel"

src/Ryujinx/UI/Windows/SettingsWindow.axaml

@@ -13,7 +13,7 @@
     xmlns:helper="clr-namespace:Ryujinx.Common.Helper;assembly=Ryujinx.Common"
     xmlns:controls="clr-namespace:Ryujinx.Ava.UI.Controls"
     Width="1100"
-    MinWidth="800"
+    MinWidth="844"
     MinHeight="480"
     Title="{ext:WindowTitle Settings}"
     WindowStartupLocation="CenterOwner"