X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fgraphics%2Fwindows%2Fdisplay.cpp;h=61fe9837d6d1db0e4cc9f7da8edcbd1f02e9c3bd;hb=e16e661417f5ba370ec77da9cb1858d3477ad780;hp=b9388e31f8ed297b85efbe20bd44b488bf7cc5b4;hpb=85609ce268bdd6a91cd26e0bda7460862d3f38d7;p=libs%2Fgui.git

diff --git a/source/graphics/windows/display.cpp b/source/graphics/windows/display.cpp
index b9388e3..61fe983 100644
--- a/source/graphics/windows/display.cpp
+++ b/source/graphics/windows/display.cpp
@@ -9,7 +9,8 @@ namespace Graphics {
 
 Display::Display(const string &):
 	primary_monitor(0),
-	priv(new Private)
+	priv(new Private),
+	focus_window(0)
 {
 	static ErrorDialog err_dlg(0);
 
@@ -52,13 +53,16 @@ Display::Display(const string &):
 			monitor.video_modes.push_back(&modes.back());
 
 			if(have_current && info.dmPelsWidth==current.dmPelsWidth && info.dmPelsHeight==current.dmPelsHeight && info.dmDisplayFrequency==current.dmDisplayFrequency)
-				monitor.desktop_mode = &modes.back();
+				monitor.desktop_settings.mode = &modes.back();
 		}
+
+		monitor.current_settings = monitor.desktop_settings;
 	}
 }
 
 Display::~Display()
 {
+	delete priv;
 }
 
 void Display::set_mode(const VideoMode &requested_mode, bool)
@@ -88,7 +92,7 @@ void Display::set_mode(const VideoMode &requested_mode, bool)
 
 	for(list<Monitor>::iterator i=monitors.begin(); i!=monitors.end(); ++i)
 		if(&*i==mode->monitor)
-			i->current_mode = mode;
+			i->current_settings.mode = mode;
 }
 
 bool Display::process_events()