From 48f491cfd12ddc489faf296898f9db050e907767 Mon Sep 17 00:00:00 2001
From: Magnus Norddahl <dpjudas@users.noreply.github.com>
Date: Wed, 14 Sep 2016 23:38:11 +0200
Subject: [PATCH] Fix video mode selection bug

---
 src/menu/videomenu.cpp | 24 ++++++++++++------------
 src/v_video.cpp        |  4 ++++
 src/v_video.h          |  4 ++++
 3 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/src/menu/videomenu.cpp b/src/menu/videomenu.cpp
index 1328e2f7a9..b1b4d792fd 100644
--- a/src/menu/videomenu.cpp
+++ b/src/menu/videomenu.cpp
@@ -95,7 +95,7 @@ CUSTOM_CVAR (Int, menu_screenratios, -1, CVAR_ARCHIVE)
 	}
 	else
 	{
-		BuildModesList (SCREENWIDTH, SCREENHEIGHT, DisplayBits);
+		BuildModesList (screen->VideoWidth, screen->VideoHeight, DisplayBits);
 	}
 }
 
@@ -139,7 +139,7 @@ public:
 
 	DVideoModeMenu()
 	{
-		SetModesMenu (SCREENWIDTH, SCREENHEIGHT, DisplayBits);
+		SetModesMenu (screen->VideoWidth, screen->VideoHeight, DisplayBits);
 	}
 
 	bool MenuEvent(int mkey, bool fromcontroller)
@@ -163,13 +163,13 @@ public:
 		{
 			if (!GetSelectedSize (&NewWidth, &NewHeight))
 			{
-				NewWidth = SCREENWIDTH;
-				NewHeight = SCREENHEIGHT;
+				NewWidth = screen->VideoWidth;
+				NewHeight = screen->VideoHeight;
 			}
 			else
 			{
-				OldWidth = SCREENWIDTH;
-				OldHeight = SCREENHEIGHT;
+				OldWidth = screen->VideoWidth;
+				OldHeight = screen->VideoHeight;
 				OldBits = DisplayBits;
 				NewBits = BitTranslate[DummyDepthCvar];
 				setmodeneeded = true;
@@ -297,11 +297,11 @@ void M_RestoreMode ()
 void M_SetDefaultMode ()
 {
 	// Make current resolution the default
-	vid_defwidth = SCREENWIDTH;
-	vid_defheight = SCREENHEIGHT;
+	vid_defwidth = screen->VideoWidth;
+	vid_defheight = screen->VideoHeight;
 	vid_defbits = DisplayBits;
 	testingmode = 0;
-	SetModesMenu (SCREENWIDTH, SCREENHEIGHT, DisplayBits);
+	SetModesMenu (screen->VideoWidth, screen->VideoHeight, DisplayBits);
 }
 
 
@@ -314,7 +314,7 @@ void M_SetDefaultMode ()
 
 void M_RefreshModesList ()
 {
-	BuildModesList (SCREENWIDTH, SCREENHEIGHT, DisplayBits);
+	BuildModesList (screen->VideoWidth, screen->VideoHeight, DisplayBits);
 }
 
 void M_InitVideoModesMenu ()
@@ -385,8 +385,8 @@ void M_SetVideoMode()
 {
 	if (!GetSelectedSize (&NewWidth, &NewHeight))
 	{
-		NewWidth = SCREENWIDTH;
-		NewHeight = SCREENHEIGHT;
+		NewWidth = screen->VideoWidth;
+		NewHeight = screen->VideoHeight;
 	}
 	else
 	{
diff --git a/src/v_video.cpp b/src/v_video.cpp
index af190d3724..b1f1ced9cf 100644
--- a/src/v_video.cpp
+++ b/src/v_video.cpp
@@ -850,6 +850,9 @@ DFrameBuffer::DFrameBuffer (int width, int height)
 {
 	LastMS = LastSec = FrameCount = LastCount = LastTic = 0;
 	Accel2D = false;
+
+	VideoWidth = width;
+	VideoHeight = height;
 }
 
 //==========================================================================
@@ -1352,6 +1355,7 @@ void V_OutputResized (int width, int height)
 	{
 		StatusBar->ScreenSizeChanged();
 	}
+	C_NewModeAdjust();
 }
 
 void V_CalcCleanFacs (int designwidth, int designheight, int realwidth, int realheight, int *cleanx, int *cleany, int *_cx1, int *_cx2)
diff --git a/src/v_video.h b/src/v_video.h
index 7317c9d1a3..d19a3b06ec 100644
--- a/src/v_video.h
+++ b/src/v_video.h
@@ -422,6 +422,10 @@ public:
 	virtual bool Is8BitMode() = 0;
 #endif
 
+	// The original size of the framebuffer as selected in the video menu.
+	int VideoWidth = 0;
+	int VideoHeight = 0;
+
 protected:
 	void DrawRateStuff ();
 	void CopyFromBuff (BYTE *src, int srcPitch, int width, int height, BYTE *dest);