diff --git a/stepmania/src/arch/LowLevelWindow/LowLevelWindow.h b/stepmania/src/arch/LowLevelWindow/LowLevelWindow.h
index 47e3d7e352..1bbd69a845 100644
--- a/stepmania/src/arch/LowLevelWindow/LowLevelWindow.h
+++ b/stepmania/src/arch/LowLevelWindow/LowLevelWindow.h
@@ -24,7 +24,7 @@ public:
 	virtual void SwapBuffers() = 0;
 	virtual void Update() { }
 
-	virtual VideoModeParams GetActualVideoModeParams() const = 0;
+	virtual const VideoModeParams &GetActualVideoModeParams() const = 0;
 
 	virtual bool SupportsThreadedRendering() { return false; }
 	virtual void BeginConcurrentRendering() { }
diff --git a/stepmania/src/arch/LowLevelWindow/LowLevelWindow_Cocoa.h b/stepmania/src/arch/LowLevelWindow/LowLevelWindow_Cocoa.h
index 565d8ab0d4..2fabd38d30 100644
--- a/stepmania/src/arch/LowLevelWindow/LowLevelWindow_Cocoa.h
+++ b/stepmania/src/arch/LowLevelWindow/LowLevelWindow_Cocoa.h
@@ -26,7 +26,7 @@ public:
 	void SwapBuffers();
 	void Update();
 	
-	VideoModeParams GetActualVideoModeParams() const { return m_CurrentParams; }
+	const VideoModeParams &GetActualVideoModeParams() const { return m_CurrentParams; }
 private:
 	void ShutDownFullScreen();
 	int ChangeDisplayMode( const VideoModeParams& p );
diff --git a/stepmania/src/arch/LowLevelWindow/LowLevelWindow_SDL.h b/stepmania/src/arch/LowLevelWindow/LowLevelWindow_SDL.h
index f783e2e398..4b4a767729 100644
--- a/stepmania/src/arch/LowLevelWindow/LowLevelWindow_SDL.h
+++ b/stepmania/src/arch/LowLevelWindow/LowLevelWindow_SDL.h
@@ -16,7 +16,7 @@ public:
 	void SwapBuffers();
 	void Update();
 
-	VideoModeParams GetActualVideoModeParams() const { return CurrentParams; }
+	const VideoModeParams &GetActualVideoModeParams() const { return CurrentParams; }
 
 private:
 	VideoModeParams CurrentParams;
diff --git a/stepmania/src/arch/LowLevelWindow/LowLevelWindow_Win32.cpp b/stepmania/src/arch/LowLevelWindow/LowLevelWindow_Win32.cpp
index bc9efb79d1..07de489ff5 100644
--- a/stepmania/src/arch/LowLevelWindow/LowLevelWindow_Win32.cpp
+++ b/stepmania/src/arch/LowLevelWindow/LowLevelWindow_Win32.cpp
@@ -281,9 +281,7 @@ void LowLevelWindow_Win32::Update()
 
 VideoModeParams LowLevelWindow_Win32::GetActualVideoModeParams() const
 {
-	VideoModeParams p;
-	GraphicsWindow::GetParams( p );
-	return p;
+		return GraphcsWindow::GetParams();
 }
 
 /*
diff --git a/stepmania/src/arch/LowLevelWindow/LowLevelWindow_Win32.h b/stepmania/src/arch/LowLevelWindow/LowLevelWindow_Win32.h
index 3eb501c720..b6fd084043 100644
--- a/stepmania/src/arch/LowLevelWindow/LowLevelWindow_Win32.h
+++ b/stepmania/src/arch/LowLevelWindow/LowLevelWindow_Win32.h
@@ -18,7 +18,7 @@ public:
 	void BeginConcurrentRendering();
 	void EndConcurrentRendering();
 
-	VideoModeParams GetActualVideoModeParams() const;
+	const VideoModeParams &GetActualVideoModeParams() const;
 };
 
 #ifdef ARCH_LOW_LEVEL_WINDOW
diff --git a/stepmania/src/arch/LowLevelWindow/LowLevelWindow_X11.h b/stepmania/src/arch/LowLevelWindow/LowLevelWindow_X11.h
index 936b8bce77..b496794156 100644
--- a/stepmania/src/arch/LowLevelWindow/LowLevelWindow_X11.h
+++ b/stepmania/src/arch/LowLevelWindow/LowLevelWindow_X11.h
@@ -17,7 +17,7 @@ public:
 	bool IsSoftwareRenderer( CString &sError );
 	void SwapBuffers();
 
-	VideoModeParams GetActualVideoModeParams() const { return CurrentParams; }
+	const VideoModeParams &GetActualVideoModeParams() const { return CurrentParams; }
 	
 	void GetDisplayResolutions( DisplayResolutions &out ) const;
 
diff --git a/stepmania/src/archutils/Win32/GraphicsWindow.cpp b/stepmania/src/archutils/Win32/GraphicsWindow.cpp
index 1f658b15af..037a38703c 100644
--- a/stepmania/src/archutils/Win32/GraphicsWindow.cpp
+++ b/stepmania/src/archutils/Win32/GraphicsWindow.cpp
@@ -468,9 +468,9 @@ HDC GraphicsWindow::GetHDC()
 	return g_HDC;
 }
 
-void GraphicsWindow::GetParams( VideoModeParams &paramsOut )
+const VideoModeParams &GraphicsWindow::GetParams()
 {
-	paramsOut = g_CurrentParams;
+	return g_CurrentParams;
 }
 
 void GraphicsWindow::Update()
diff --git a/stepmania/src/archutils/Win32/GraphicsWindow.h b/stepmania/src/archutils/Win32/GraphicsWindow.h
index 2ccd8c0a1a..1a095209ab 100644
--- a/stepmania/src/archutils/Win32/GraphicsWindow.h
+++ b/stepmania/src/archutils/Win32/GraphicsWindow.h
@@ -21,7 +21,7 @@ namespace GraphicsWindow
 
 	void GetDisplayResolutions( DisplayResolutions &out );
 
-	void GetParams( VideoModeParams &paramsOut );
+	const VideoModeParams &GetParams();
 	HDC GetHDC();
 	void Update();
 
diff --git a/stepmania/src/archutils/Xbox/GraphicsWindow.cpp b/stepmania/src/archutils/Xbox/GraphicsWindow.cpp
index e894bd1742..e18e3b6d2d 100644
--- a/stepmania/src/archutils/Xbox/GraphicsWindow.cpp
+++ b/stepmania/src/archutils/Xbox/GraphicsWindow.cpp
@@ -17,9 +17,9 @@ void GraphicsWindow::SetVideoModeParams( const VideoModeParams &params )
 	g_CurrentParams = params;
 }
 
-void GraphicsWindow::GetParams( VideoModeParams &paramsOut )
+const VideoModeParams &GraphicsWindow::GetParams()
 {
-	paramsOut = g_CurrentParams;
+	return g_CurrentParams;
 }
 
 void GraphicsWindow::Update()
diff --git a/stepmania/src/archutils/Xbox/GraphicsWindow.h b/stepmania/src/archutils/Xbox/GraphicsWindow.h
index 4ab96ba6f2..f534b37997 100644
--- a/stepmania/src/archutils/Xbox/GraphicsWindow.h
+++ b/stepmania/src/archutils/Xbox/GraphicsWindow.h
@@ -16,7 +16,7 @@ namespace GraphicsWindow
 	void RecreateGraphicsWindow( const VideoModeParams &p );
 	void DestroyGraphicsWindow();
 	void ConfigureGraphicsWindow( const VideoModeParams &p );
-	void GetParams( VideoModeParams &paramsOut );
+	const VideoModeParams &GetParams();
 	void Update();
 };