From: Toni Wilen <twilen@winuae.net>
Date: Tue, 19 Jun 2018 19:51:59 +0000 (+0300)
Subject: Refresh display after unminimize.
X-Git-Tag: 4000~2
X-Git-Url: https://git.unchartedbackwaters.co.uk/w/?a=commitdiff_plain;h=3554429bf05656d3152b86234c665c2ab035ccfa;p=francis%2Fwinuae.git

Refresh display after unminimize.
---

diff --git a/drawing.cpp b/drawing.cpp
index afae7f39..7c92d3a3 100644
--- a/drawing.cpp
+++ b/drawing.cpp
@@ -4002,17 +4002,24 @@ void redraw_frame(void)
 void full_redraw_all(void)
 {
 	int monid = 0;
+	bool redraw = false;
 	struct amigadisplay *ad = &adisplays[monid];
 	struct vidbuf_description *vidinfo = &adisplays[monid].gfxvidinfo;
-	if (!vidinfo->drawbuffer.height_allocated || !amiga2aspect_line_map)
-		return;
-	notice_screen_contents_lost(monid);
-	gfxboard_refresh(monid);
-	if (!ad->picasso_on) {
-		redraw_frame();
+	if (vidinfo->drawbuffer.height_allocated && amiga2aspect_line_map) {
+		notice_screen_contents_lost(monid);
+		if (!ad->picasso_on) {
+			redraw_frame();
+			redraw = true;
+		}
+	}
+	if (ad->picasso_on) {
+		gfxboard_refresh(monid);
+		redraw = true;
+	}
+	if (redraw) {
+		render_screen(0, 1, true);
+		show_screen(0, 0);
 	}
-	render_screen(0, 1, true);
-	show_screen(0, 0);
 }
 
 bool vsync_handle_check (void)
diff --git a/od-win32/win32.cpp b/od-win32/win32.cpp
index c1097e06..bdf3c918 100644
--- a/od-win32/win32.cpp
+++ b/od-win32/win32.cpp
@@ -711,6 +711,8 @@ void unsetminimized(int monid)
 {
 	if (minimized < 0)
 		WIN32GFX_DisplayChangeRequested(2);
+	else if (minimized > 0)
+		full_redraw_all();
 	minimized = 0;
 	clear_inhibit_frame(monid, IHF_WINDOWHIDDEN);
 }