Yaya48/dolphin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Android: Add additional null check in GCAdapter

Browse Source 
Just in case, since the documentation says this could be null.
This commit is contained in:
JosJuice
2025-07-27 11:37:45 +02:00
parent 1c7df370d9
commit 8524e725a8
1 changed files with 40 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/GCAdapter.java
+8 -3
View File
@@ -142,10 +142,16 @@ public class GCAdapter
{ {
dev = adapterDevice; dev = adapterDevice;
} }
if (dev == null)
if (dev != null)
{ {
return false;
}
usbConnection = manager.openDevice(dev); usbConnection = manager.openDevice(dev);
if (usbConnection == null)
{
return false;
}
Log.info("GCAdapter: Number of configurations: " + dev.getConfigurationCount()); Log.info("GCAdapter: Number of configurations: " + dev.getConfigurationCount());
Log.info("GCAdapter: Number of interfaces: " + dev.getInterfaceCount()); Log.info("GCAdapter: Number of interfaces: " + dev.getInterfaceCount());
@@ -178,7 +184,6 @@ public class GCAdapter
Toast.makeText(DolphinApplication.getAppContext(), R.string.replug_gc_adapter, Toast.makeText(DolphinApplication.getAppContext(), R.string.replug_gc_adapter,
Toast.LENGTH_LONG).show(); Toast.LENGTH_LONG).show();
usbConnection.close(); usbConnection.close();
}
return false; return false;
} }