Merge pull request #665 from QuarkTheAwesome/libretro-merge-be

[pcsx_rearmed.git] / libpcsxcore / plugins.c

diff --git a/libpcsxcore/plugins.c b/libpcsxcore/plugins.c
index a2f8fe2..87b574d 100644 (file)
--- a/libpcsxcore/plugins.c
+++ b/libpcsxcore/plugins.c
@@ -776,7 +776,9 @@ unsigned char _PADpoll(int port, unsigned char value) {
        }
 
        //if no new request the pad return 0xff, for signaling connected
-       if (reqPos >= respSize) return 0xff;
+       if (reqPos >= respSize
+        && writeok
+        ) return 0xff;
 
        switch(reqPos){
                case 2:
@@ -791,8 +793,7 @@ unsigned char _PADpoll(int port, unsigned char value) {
                                //mem the vibration value for Large motor;
                                pad[port].Vib[1] = value;
 
-                               if (in_type[port] == PSE_PAD_TYPE_STANDARD &&
-                                       in_type[port] == PSE_PAD_TYPE_NEGCON)
+                               if (in_type[port] != PSE_PAD_TYPE_ANALOGPAD)
                                        break;
 
                                //vibration