Fixed crash when no gamepad is connected

Axadiw · Jan 17, 2016 · de13c62 · de13c62
1 parent d4bd29f
commit de13c62
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 9 deletions.
diff --git a/MFIGamepadFeeder/Gamepads/GamepadManager.cs b/MFIGamepadFeeder/Gamepads/GamepadManager.cs
@@ -99,13 +99,16 @@ public void Refresh()
         public void SetupGamepad(HidDeviceRepresentation hidDeviceRepresentation, uint gamePadId,
             GamepadConfiguration config)
         {
-            var device =
-                _hidDeviceLoader.GetDevices(
-                    hidDeviceRepresentation.VendorId,
-                    hidDeviceRepresentation.ProductId,
-                    hidDeviceRepresentation.ProductVersion,
-                    hidDeviceRepresentation.SerialNumber
-                    ).First();
+            try
+            {
+                var device =
+                    _hidDeviceLoader.GetDevices(
+                        hidDeviceRepresentation.VendorId,
+                        hidDeviceRepresentation.ProductId,
+                        hidDeviceRepresentation.ProductVersion,
+                        hidDeviceRepresentation.SerialNumber
+                        ).First();
+
 
             if (device == null)
             {
@@ -139,13 +142,23 @@ public void SetupGamepad(HidDeviceRepresentation hidDeviceRepresentation, uint g
                     {
                         continue;
                     }
+                        catch (Exception ex)
+                        {
+                            Log(ex.Message);
+                            break;
+                        }
 
                     if (count > 0)
                     {
                         gamepad.UpdateState(bytes);
                     }
                 }
             }
+            }
+            catch (Exception ex)
+            {
+                Log(ex.Message);
+            }
         }
 
         private async Task<GamepadConfiguration> GetConfigFromFilePath(string filePath)

diff --git a/MFIGamepadFeeder/Properties/AssemblyInfo.cs b/MFIGamepadFeeder/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.0.1.0")]
+[assembly: AssemblyFileVersion("1.0.1.0")]