Merge branch 'main' into jn/ega-on-vga-fixes

dosbox-staging · Jan 29, 2024 · f5acd15 · f5acd15
2 parents 5eb23a6 + d47e8c6
commit f5acd15
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/src/hardware/vga_crtc.cpp b/src/hardware/vga_crtc.cpp
@@ -198,6 +198,12 @@ void vga_write_p3d5(io_port_t, io_val_t value, io_width_t)
 			if (old_val.data == flipped.data) {
 				VGA_StartResize();
 			}
+
+			vga.draw.address_line_total = new_val.maximum_scan_line + 1;
+
+			if (new_val.is_scan_doubling_enabled) {
+				vga.draw.address_line_total *= 2;
+			}
 		} else {
 			auto flipped = new_val;
 			flipped.maximum_scan_line = new_val.maximum_scan_line ^ 1;
@@ -220,12 +226,6 @@ void vga_write_p3d5(io_port_t, io_val_t value, io_width_t)
 				VGA_StartResize();
 			}
 		}
-
-		vga.draw.address_line_total = new_val.maximum_scan_line + 1;
-
-		if (new_val.is_scan_doubling_enabled) {
-			vga.draw.address_line_total *= 2;
-		}
 	} break;
 
 	case 0x0a: // Cursor Start Register