uxn

commit 5905afc97dfb454b24f07bf3466d7ed6a9edcf39
parent 718a74641e2c2077982798f5ff5a992e9ed3ead0
Author: neauoire <aliceffekt@gmail.com>
Date:   Wed, 22 Sep 2021 11:35:00 -0700

Use set_zoom() but test for gWindow before resize

Diffstat:
M
src/uxnemu.c
 | 
7
++++---

1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/uxnemu.c b/src/uxnemu.c
@@ -128,8 +128,9 @@ set_zoom(Uint8 scale)
 	if(scale == zoom)
 		return;
 	zoom = clamp(scale, 1, 3);
-	set_window_size(gWindow, (ppu.width + PAD * 2) * zoom, (ppu.height + PAD * 2) * zoom);
 	reqdraw = 1;
+	if(gWindow)
+		set_window_size(gWindow, (ppu.width + PAD * 2) * zoom, (ppu.height + PAD * 2) * zoom);
 }
 
 static int
@@ -600,12 +601,12 @@ main(int argc, char **argv)
 
 	/* set default zoom */
 	SDL_GetCurrentDisplayMode(0, &DM);
-	zoom = clamp(DM.w / 1280, 1, 3);
+	set_zoom(DM.w / 1280);
 	/* get default zoom from flags */
 	for(i = 1; i < argc - 1; i++) {
 		if(strcmp(argv[i], "-s") == 0) {
 			if((i + 1) < argc - 1)
-				zoom = clamp(atoi(argv[++i]), 1, 3);
+				set_zoom(clamp(atoi(argv[++i]), 1, 3));
 			else
 				return error("Opt", "-s No scale provided.");
 		}