From: Toni Wilen <twilen@winuae.net>
Date: Sat, 14 Feb 2026 12:39:29 +0000 (+0200)
Subject: Merge
X-Git-Url: https://git.unchartedbackwaters.co.uk/w/?a=commitdiff_plain;h=5f31258bbb5ee696bab37f8687e24063309f85b4;p=francis%2Fwinuae.git

Merge
---

5f31258bbb5ee696bab37f8687e24063309f85b4
diff --cc custom.cpp
index c0beb809,9fcbc262..75b6bf9c
--- a/custom.cpp
+++ b/custom.cpp
@@@ -12099,10 -12466,8 +12108,11 @@@ static void sync_equalline_handler(void
  
  	custom_trigger_start();
  
 +	check_vsyncs_fast();
 +	vsync_linecnt++;
 +
  	if (eventtab[ev_sync].active) {
+ 		check_vsyncs_fast();
  		check_bpl_vdiw();
  		do_imm_dmal();
  	} else {
diff --cc drawing.cpp
index eb594588,984fce1a..168816d5
--- a/drawing.cpp
+++ b/drawing.cpp
@@@ -5727,11 -5676,19 +5727,20 @@@ static void get_line(int monid, int gfx
  				}
  			}
  		}
 +		denise_pixtotal_max--;
  	}
  	
+ 	denise_pixtotal *= 2;
+ 
+ 	if (buf1) {
+ 		int maxw = (uae_u32*)xlinebuffer_end - buf1;
+ 		if ((denise_pixtotal_max << hresolution) > maxw) {
+ 			denise_pixtotal_max = maxw >> hresolution;
+ 		}
+ 	}
+ 
  	if (xshift > 0) {
- 		denise_pixtotal_max -= xshift;
+ 		denise_pixtotal_max -= xshift * 2;
  	}
  	if (!buf1) {
  		denise_pixtotal_max = -0x7fffffff;