From 75535fba727d0aa9c733c4ee4cf9d32d1d75ab93 Mon Sep 17 00:00:00 2001
From: Randy Heit <rheit@zdoom.fake>
Date: Wed, 18 Sep 2013 21:32:46 -0500
Subject: [PATCH] Do not enter testing mode if a valid mode is not selected.

- It doesn't make much sense to "test" the current mode if a non-video
  mode is selected in the menu, so don't.
---
 src/menu/videomenu.cpp | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/menu/videomenu.cpp b/src/menu/videomenu.cpp
index f26b90704..1d1d02383 100644
--- a/src/menu/videomenu.cpp
+++ b/src/menu/videomenu.cpp
@@ -166,15 +166,18 @@ public:
 				NewWidth = SCREENWIDTH;
 				NewHeight = SCREENHEIGHT;
 			}
-			OldWidth = SCREENWIDTH;
-			OldHeight = SCREENHEIGHT;
-			OldBits = DisplayBits;
-			NewBits = BitTranslate[DummyDepthCvar];
-			setmodeneeded = true;
-			testingmode = I_GetTime(false) + 5 * TICRATE;
-			S_Sound (CHAN_VOICE | CHAN_UI, "menu/choose", snd_menuvolume, ATTN_NONE);
-			SetModesMenu (NewWidth, NewHeight, NewBits);
-			return true;
+			else
+			{
+				OldWidth = SCREENWIDTH;
+				OldHeight = SCREENHEIGHT;
+				OldBits = DisplayBits;
+				NewBits = BitTranslate[DummyDepthCvar];
+				setmodeneeded = true;
+				testingmode = I_GetTime(false) + 5 * TICRATE;
+				S_Sound (CHAN_VOICE | CHAN_UI, "menu/choose", snd_menuvolume, ATTN_NONE);
+				SetModesMenu (NewWidth, NewHeight, NewBits);
+				return true;
+			}
 		}
 		return Super::Responder(ev);
 	}