--- np2/win9x/np2.cpp	2003/10/21 14:57:41	1.6
+++ np2/win9x/np2.cpp	2003/10/23 12:58:44	1.8
@@ -810,6 +810,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT
 			if (LOWORD(wParam) != WA_INACTIVE) {
 				np2break &= ~NP2BREAK_MAIN;
 				scrnmng_update();
+				keystat_allrelease();
 				mouse_running(MOUSE_CONT_M);
 			}
 			else {
@@ -1367,22 +1368,30 @@ int WINAPI WinMain(HINSTANCE hInstance, 
 				}
 				else {								// auto skip
 					if (!waitcnt) {
+						UINT cnt;
 						joy_flash();
 						mouse_callback();
 						pccore_exec(framecnt == 0);
 						dclock_callback();
 						framecnt++;
-						if (timing_getcount() < framecnt) {
+						cnt = timing_getcount();
+						if (framecnt > cnt) {
 							waitcnt = framecnt;
 							if (framemax > 1) {
 								framemax--;
 							}
 						}
 						else if (framecnt >= framemax) {
-							waitcnt = framecnt;
 							if (framemax < 12) {
 								framemax++;
 							}
+							if (cnt >= 12) {
+								timing_reset();
+							}
+							else {
+								timing_setcount(cnt - framecnt);
+							}
+							framecnt = 0;
 						}
 					}
 					else {