From 951c2b7662d9b637e4709e88769c6b35b1894d2a Mon Sep 17 00:00:00 2001 From: Dimitris Panokostas Date: Sat, 11 Jul 2020 00:19:08 +0200 Subject: [PATCH] Don't set screen_is_picasso = 0 during reset --- src/machdep/support.cpp | 4 ++-- src/main.cpp | 5 ++--- src/osdep/amiberry_gfx.cpp | 3 +-- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/machdep/support.cpp b/src/machdep/support.cpp index 769153a2..ddf4f91e 100644 --- a/src/machdep/support.cpp +++ b/src/machdep/support.cpp @@ -11,8 +11,8 @@ int machdep_init(void) { struct amigadisplay* ad = &adisplays; - ad->picasso_requested_on = 0; - ad->picasso_on = 0; + ad->picasso_requested_on = false; + ad->picasso_on = false; screen_is_picasso = 0; // Initialize timebase diff --git a/src/main.cpp b/src/main.cpp index 270878dc..f2e63f30 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -574,9 +574,8 @@ void uae_reset(int hardreset, int keyboardreset) quit_program = -UAE_RESET_HARD; } struct amigadisplay* ad = &adisplays; - ad->picasso_requested_on = 0; - ad->picasso_on = 0; - screen_is_picasso = 0; + ad->picasso_requested_on = false; + ad->picasso_on = false; } void uae_quit(void) diff --git a/src/osdep/amiberry_gfx.cpp b/src/osdep/amiberry_gfx.cpp index 3e9bdae2..33582d25 100644 --- a/src/osdep/amiberry_gfx.cpp +++ b/src/osdep/amiberry_gfx.cpp @@ -1548,9 +1548,8 @@ void picasso_init_resolutions() #ifdef PICASSO96 void gfx_set_picasso_state(int on) { - if (on == screen_is_picasso) + if (screen_is_picasso == on) return; - screen_is_picasso = on; open_screen(&currprefs); }