Bugfix #25357

Having 2 windows open, rendering to image editor, activate other
window and press F11 -> UI went haywire. Simple fix prevents
render output to be closed in this case.

1 files changed, 20 insertions, 17 deletions

diff --git a/source/blender/editors/render/render_internal.c b/source/blender/editors/render/render_internal.c
index 339bcf2ab4a..96e48631b09 100644
--- a/source/blender/editors/render/render_internal.c
+++ b/source/blender/editors/render/render_internal.c
@@ -866,23 +866,26 @@ static int render_view_show_invoke(bContext *C, wmOperator *UNUSED(unused), wmEv
 		
 		/* determine if render already shows */
 		if(sa) {
-			SpaceImage *sima= sa->spacedata.first;
-
-			if(sima->flag & SI_PREVSPACE) {
-				sima->flag &= ~SI_PREVSPACE;
-
-				if(sima->flag & SI_FULLWINDOW) {
-					sima->flag &= ~SI_FULLWINDOW;
-					ED_screen_full_prevspace(C, sa);
-				}
-				else if(sima->next) {
-					/* workaround for case of double prevspace, render window
-					   with a file browser on top of it (same as in ED_area_prevspace) */
-					if(sima->next->spacetype == SPACE_FILE && sima->next->next)
-						ED_area_newspace(C, sa, sima->next->next->spacetype);
-					else
-						ED_area_newspace(C, sa, sima->next->spacetype);
-					ED_area_tag_redraw(sa);
+			/* but don't close it when rendering */
+			if(!G.rendering) {
+				SpaceImage *sima= sa->spacedata.first;
+
+				if(sima->flag & SI_PREVSPACE) {
+					sima->flag &= ~SI_PREVSPACE;
+
+					if(sima->flag & SI_FULLWINDOW) {
+						sima->flag &= ~SI_FULLWINDOW;
+						ED_screen_full_prevspace(C, sa);
+					}
+					else if(sima->next) {
+						/* workaround for case of double prevspace, render window
+						   with a file browser on top of it (same as in ED_area_prevspace) */
+						if(sima->next->spacetype == SPACE_FILE && sima->next->next)
+							ED_area_newspace(C, sa, sima->next->next->spacetype);
+						else
+							ED_area_newspace(C, sa, sima->next->spacetype);
+						ED_area_tag_redraw(sa);
+					}
 				}
 			}
 		}