From 6bdaf7caee1dcf288572e78c5bd5091c50c71b72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= <hrydgard@gmail.com>
Date: Wed, 29 Jul 2026 14:40:53 +0200
Subject: [PATCH] Fix null pointer access in InfraredHelper.java

---
 android/src/org/ppsspp/ppsspp/InfraredHelper.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/android/src/org/ppsspp/ppsspp/InfraredHelper.java b/android/src/org/ppsspp/ppsspp/InfraredHelper.java
index 660932717c..cef1fda031 100644
--- a/android/src/org/ppsspp/ppsspp/InfraredHelper.java
+++ b/android/src/org/ppsspp/ppsspp/InfraredHelper.java
@@ -10,12 +10,16 @@ import java.util.Arrays;
 import java.util.List;
 
 class InfraredHelper {
-	private static final String TAG = InfraredHelper.class.getSimpleName();
+	private static final String TAG = "PPSSPPActivity";
 	private static final int SIRC_FREQ = 40000;
 	private final ConsumerIrManager mConsumerIrManager;
 
 	InfraredHelper(Context context) throws Exception {
 		mConsumerIrManager = (ConsumerIrManager) context.getSystemService(Context.CONSUMER_IR_SERVICE);
+		if (mConsumerIrManager == null) {
+			Log.i(TAG, "No IR manager detected.");
+			return;
+		}
 		Log.d(TAG, "HasIrEmitter: " + mConsumerIrManager.hasIrEmitter());
 		if (!mConsumerIrManager.hasIrEmitter()) {
 			throw new Exception("No Ir Emitter");