From 366af9a6f171b230845fc45e08e20788c7649b39 Mon Sep 17 00:00:00 2001
From: notaz <notasas@gmail.com>
Date: Sun, 15 Mar 2026 01:33:47 +0200
Subject: [PATCH] input: fix some corner cases

---
 libpcsxcore/pad.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/libpcsxcore/pad.c b/libpcsxcore/pad.c
index 13d7de89..2a409bdf 100644
--- a/libpcsxcore/pad.c
+++ b/libpcsxcore/pad.c
@@ -597,7 +597,8 @@ int padFreeze(void *f, int Mode)
 			if (g.pads[i].saveSize != sizeof(g.pads[i]))
 				SaveFuncs.seek(f, g.pads[i].saveSize - sizeof(g.pads[i]),
 						SEEK_CUR);
-			changed |= controllerType != g.pads[i].controllerType;
+			if (controllerType)
+				changed |= controllerType != g.pads[i].controllerType;
 			changed |= portMultitap != g.pads[i].portMultitap;
 		}
 	}
@@ -621,5 +622,5 @@ int padToggleAnalog(unsigned int index)
 void padChanged(void)
 {
 	padReset();
-	g.replug_frame = frame_counter;
+	g.replug_frame = frame_counter ? frame_counter : -1;
 }
-- 
2.47.3