From 77ea4a9fb7bb4738fe6dce164295855322ea2845 Mon Sep 17 00:00:00 2001
From: "alexey.lysiuk" <alexey.lysiuk@gmail.com>
Date: Wed, 26 Jun 2019 22:26:14 +0300
Subject: [PATCH] - fixed inconsistent wipe state with stereo 3D mode enabled

https://forum.zdoom.org/viewtopic.php?t=65181
---
 src/d_main.cpp | 38 ++++++++++++++++++++++----------------
 1 file changed, 22 insertions(+), 16 deletions(-)

diff --git a/src/d_main.cpp b/src/d_main.cpp
index 12504081ca..8a56a672b8 100644
--- a/src/d_main.cpp
+++ b/src/d_main.cpp
@@ -733,27 +733,33 @@ void D_Display ()
 		wipegamestate = gamestate;
 	}
 	// No wipes when in a stereo3D VR mode
-	else if (gamestate != wipegamestate && gamestate != GS_FULLCONSOLE && gamestate != GS_TITLELEVEL && (vr_mode == 0 || vid_rendermode != 4))
-	{ // save the current screen if about to wipe
-		wipe = screen->WipeStartScreen ();
-		switch (wipegamestate)
+	else if (gamestate != wipegamestate && gamestate != GS_FULLCONSOLE && gamestate != GS_TITLELEVEL)
+	{
+		if (vr_mode == 0 || vid_rendermode != 4)
 		{
-		default:
-			wipe_type = wipetype;
-			break;
+			// save the current screen if about to wipe
+			wipe = screen->WipeStartScreen ();
 
-		case GS_FORCEWIPEFADE:
-			wipe_type = wipe_Fade;
-			break;
+			switch (wipegamestate)
+			{
+			default:
+				wipe_type = wipetype;
+				break;
 
-		case GS_FORCEWIPEBURN:
-			wipe_type =wipe_Burn;
-			break;
+			case GS_FORCEWIPEFADE:
+				wipe_type = wipe_Fade;
+				break;
 
-		case GS_FORCEWIPEMELT:
-			wipe_type = wipe_Melt;
-			break;
+			case GS_FORCEWIPEBURN:
+				wipe_type = wipe_Burn;
+				break;
+
+			case GS_FORCEWIPEMELT:
+				wipe_type = wipe_Melt;
+				break;
+			}
 		}
+
 		wipegamestate = gamestate;
 	}
 	else