From 4f8cdc1639aedf5aac2c6c6b92ce0af9f2035035 Mon Sep 17 00:00:00 2001
From: Toni Wilen <twilen@winuae.net>
Date: Sat, 29 Nov 2025 13:24:13 +0200
Subject: [PATCH] 6020b6

---
 custom.cpp       | 10 ++++++----
 dongle.cpp       |  3 ++-
 od-win32/win32.h |  4 ++--
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/custom.cpp b/custom.cpp
index 0b05f375..8887471d 100644
--- a/custom.cpp
+++ b/custom.cpp
@@ -1384,6 +1384,9 @@ void compute_vsynctime(void)
 	}
 	vsynctimebase_orig = vsynctimebase;
 	cputimebase = syncbase / ((uae_u32)(svpos * shpos));
+	if (cputimebase == 0) {
+		cputimebase = 1;
+	}
 
 	if (linetoggle) {
 		shpos += 0.5f;
@@ -2540,6 +2543,7 @@ static uae_u16 VPOSR(void)
 	if (1 || (M68K_GETPC < 0x00f00000 || M68K_GETPC >= 0x10000000))
 		write_log (_T("VPOSR %04x at %08x\n"), vp, M68K_GETPC);
 #endif
+
 	return vp;
 }
 
@@ -5330,6 +5334,7 @@ static void handle_nosignal(void)
 		struct amigadisplay *ad = &adisplays[0];
 		nosignal_trigger = false;
 		resetfulllinestate();
+		denise_clearbuffers();
 		if (!ad->specialmonitoron) {
 			if (currprefs.gfx_monitorblankdelay > 0) {
 				nosignal_status = 1;
@@ -5580,10 +5585,6 @@ static void hsync_handler_pre(bool onvsync)
 {
 	if (!custom_disabled) {
 
-		// make sure decisions are done to end of scanline
-		//finish_partial_decision(maxhpos);
-		//clear_bitplane_pipeline(0);
-
 		/* reset light pen latch */
 		if (agnus_vb_active_end_line) {
 			lightpen_triggered = 0;
@@ -10277,6 +10278,7 @@ static void shift_dmal(void)
 {
 	dmal_shifter <<= 1;
 }
+
 static void handle_dmal(void)
 {
 	if (!dmal_shifter) {
diff --git a/dongle.cpp b/dongle.cpp
index 0c507aa9..5ea3f1b2 100644
--- a/dongle.cpp
+++ b/dongle.cpp
@@ -35,7 +35,7 @@
 #define FOOTBALLDIRECTOR2 15
 
 static int dflag;
-static frame_time_t cycles;
+static evt_t cycles;
 
 /*
 RoboCop 3
@@ -118,6 +118,7 @@ static uae_u8 oldcia[2][16];
 
 void dongle_reset (void)
 {
+	cycles = 0;
 	dflag = 0;
 	memset (oldcia, 0, sizeof oldcia);
 }
diff --git a/od-win32/win32.h b/od-win32/win32.h
index 28ff9f2c..d6c63419 100644
--- a/od-win32/win32.h
+++ b/od-win32/win32.h
@@ -20,12 +20,12 @@
 #define LANG_DLL_FULL_VERSION_MATCH 1
 
 #if WINUAEPUBLICBETA
-#define WINUAEBETA _T("5")
+#define WINUAEBETA _T("6")
 #else
 #define WINUAEBETA _T("")
 #endif
 
-#define WINUAEDATE MAKEBD(2025, 11, 2)
+#define WINUAEDATE MAKEBD(2025, 11, 29)
 
 //#define WINUAEEXTRA _T("AmiKit Preview")
 //#define WINUAEEXTRA _T("Amiga Forever Edition")
-- 
2.47.3