Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-17 21:25:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r10834) -Revert (part of r10833): something too much was committed :(

Browse Source
This commit is contained in:
rubidium 2007-08-09 05:34:56 +00:00
parent 36da8a2a38
commit b9370f0247
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/video/win32_v.cpp
View File

@ -219,9 +219,8 @@ static void MakeWindow(bool full_screen)
// recreate window? // recreate window?
if ((full_screen || _wnd.fullscreen) && _wnd.main_wnd) { if ((full_screen || _wnd.fullscreen) && _wnd.main_wnd) {
HWND wnd = _wnd.main_wnd; DestroyWindow(_wnd.main_wnd);
_wnd.main_wnd = 0; _wnd.main_wnd = 0;
DestroyWindow(wnd);
} }
#if defined(WINCE) #if defined(WINCE)
@ -520,9 +519,6 @@ static LRESULT CALLBACK WndProcGdi(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP
break; break;
case WM_SIZE: case WM_SIZE:
/* Resizing a destroy window is NOT good */
if (_wnd.main_wnd == 0) return;
if (wParam != SIZE_MINIMIZED) { if (wParam != SIZE_MINIMIZED) {
/* Set maximized flag when we maximize (obviously), but also when we /* Set maximized flag when we maximize (obviously), but also when we
* switched to fullscreen from a maximized state */ * switched to fullscreen from a maximized state */
@ -796,9 +792,7 @@ void VideoDriver_Win32::Stop()
{ {
DeleteObject(_wnd.gdi_palette); DeleteObject(_wnd.gdi_palette);
DeleteObject(_wnd.dib_sect); DeleteObject(_wnd.dib_sect);
HWND wnd = _wnd.main_wnd; DestroyWindow(_wnd.main_wnd);
_wnd.main_wnd = 0;
DestroyWindow(wnd);
#if !defined(WINCE) #if !defined(WINCE)
if (_wnd.fullscreen) ChangeDisplaySettings(NULL, 0); if (_wnd.fullscreen) ChangeDisplaySettings(NULL, 0);