From 0023938081dd950c5053b487c08f6a04dea7be78 Mon Sep 17 00:00:00 2001
From: Brad Hughes <bradhugh@outlook.com>
Date: Thu, 26 May 2016 19:41:06 -0400
Subject: [PATCH] Fix -resolution and -switchres

---
 src/osd/modules/osdwindow.h | 3 ++-
 src/osd/sdl/window.cpp      | 3 +--
 src/osd/windows/window.cpp  | 4 +---
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/osd/modules/osdwindow.h b/src/osd/modules/osdwindow.h
index 5e2b3f54eb4..c9f311c6ebf 100644
--- a/src/osd/modules/osdwindow.h
+++ b/src/osd/modules/osdwindow.h
@@ -111,12 +111,13 @@ class osd_renderer;
 class osd_window : public std::enable_shared_from_this<osd_window>
 {
 public:
-	osd_window()
+	osd_window(const osd_window_config &config)
 	:
 #ifndef OSD_SDL
 		m_dc(nullptr), m_resize_state(0),
 #endif
 		m_primlist(nullptr),
+		m_win_config(config),
 		m_index(0),
 		m_prescale(1),
 		m_platform_window(nullptr),
diff --git a/src/osd/sdl/window.cpp b/src/osd/sdl/window.cpp
index de4961362d0..a5b3a6910cf 100644
--- a/src/osd/sdl/window.cpp
+++ b/src/osd/sdl/window.cpp
@@ -1094,14 +1094,13 @@ osd_dim sdl_window_info::get_max_bounds(int constrain)
 
 sdl_window_info::sdl_window_info(running_machine &a_machine, int index, osd_monitor_info *a_monitor,
 		const osd_window_config *config)
-: osd_window(), m_next(nullptr), m_startmaximized(0),
+: osd_window(*config), m_next(nullptr), m_startmaximized(0),
 	// Following three are used by input code to defer resizes
 	m_minimum_dim(0,0),
 	m_windowed_dim(0,0),
 	m_rendered_event(0, 1), m_target(nullptr), m_extra_flags(0),
 	m_machine(a_machine), m_monitor(a_monitor), m_fullscreen(0)
 {
-	m_win_config = *config;
 	m_index = index;
 
 	//FIXME: these should be per_window in config-> or even better a bit set
diff --git a/src/osd/windows/window.cpp b/src/osd/windows/window.cpp
index ee229707482..06bd3c67ea0 100644
--- a/src/osd/windows/window.cpp
+++ b/src/osd/windows/window.cpp
@@ -300,7 +300,7 @@ win_window_info::win_window_info(
 	running_machine &machine,
 	int index,
 	osd_monitor_info *monitor,
-	const osd_window_config *config) : osd_window(),
+	const osd_window_config *config) : osd_window(*config),
 		m_next(nullptr),
 		m_init_state(0),
 		m_startmaximized(0),
@@ -325,8 +325,6 @@ win_window_info::win_window_info(
 	m_non_fullscreen_bounds.right  = 0;
 	m_non_fullscreen_bounds.bottom = 0;
 	m_prescale = video_config.prescale;
-
-
 }
 
 win_window_info::~win_window_info()