Merge pull request #32 from orangepascal/master

fixed issue with iOS15 controller support
libgdx · Apr 27, 2023 · fc0af91 · fc0af91
2 parents 88092dd + fb185a1
commit fc0af91
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/gdx-controllers-core/src/com/badlogic/gdx/controllers/Controllers.java b/gdx-controllers-core/src/com/badlogic/gdx/controllers/Controllers.java
@@ -32,7 +32,7 @@
  * 
  * @author Nathan Sweet */
 public class Controllers {
-	private static final String TAG = "Controllers";
+	private static final String TAG = "ControllersOP";
 	static final ObjectMap<Application, ControllerManager> managers = new ObjectMap<Application, ControllerManager>();
     /**
      * The class name of a preferred {@link ControllerManager}. If this is null then an appropriate ControllerManager will

diff --git a/gdx-controllers-ios/src/com/badlogic/gdx/controllers/IosController.java b/gdx-controllers-ios/src/com/badlogic/gdx/controllers/IosController.java
@@ -80,8 +80,10 @@ public void invoke(GCGamepad gcGamepad, GCControllerElement gcControllerElement)
             });
 
         if (Foundation.getMajorSystemVersion() >= 14) try {
-            hapticEngine = controller.getHaptics().createEngine(GCHapticsLocality.Default);
-            hapticEngine.retain();
+            if (controller.getHaptics()!=null) {
+                hapticEngine = controller.getHaptics().createEngine(GCHapticsLocality.Default);
+                hapticEngine.retain();
+            }
         } catch (Throwable t) {
             Gdx.app.error("Controllers", "Failed to create haptics engine", t);
         }