X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=frontend%2Fplugin.c;h=6bb9aa497b8d8c4c8495ebd6f823b3b9b6f6122d;hb=229fe6f5478221c6a23054089ba2c446697eeccc;hp=5663e6d9a1e4f2d5cbad18e6321cdf2dcaaac745;hpb=3b1a5e21b399fcb38c5d8ead3c16603f566d7ffa;p=pcsx_rearmed.git

diff --git a/frontend/plugin.c b/frontend/plugin.c
index 5663e6d9..6bb9aa49 100644
--- a/frontend/plugin.c
+++ b/frontend/plugin.c
@@ -49,7 +49,8 @@ extern void CALLBACK SPUasync(unsigned int, unsigned int);
 extern int  CALLBACK SPUplayCDDAchannel(short *, int);
 
 /* PAD */
-static long PADreadPort1(PadDataS *pad, int pad_index) {
+static long PADreadPort1(PadDataS *pad) {
+	int pad_index = pad->requestPadIndex;
     pad->controllerType = in_type[pad_index];
     pad->buttonStatus = ~in_keystate[pad_index];
     if (multitap1 == 1)
@@ -67,15 +68,12 @@ static long PADreadPort1(PadDataS *pad, int pad_index) {
     return 0;
 }
 
-static long PADreadPort2(PadDataS *pad, int pad_index) {
-    /* Temporary hack to avoid segfault when pad_index is a crazy number */
-    if (pad_index <= 1 || pad_index > 8) {
-        pad_index = 1;
-    }
-
+static long PADreadPort2(PadDataS *pad) {
+	int pad_index = pad->requestPadIndex;
+    
     pad->controllerType = in_type[pad_index];
     pad->buttonStatus = ~in_keystate[pad_index];
-    if (multitap2 ==1 )
+    if (multitap2 == 1)
     	pad->portMultitap = 2;
     else
     	pad->portMultitap = 0;