summaryrefslogtreecommitdiff
path: root/Source/Plugins/Plugin_VideoSoftware/Src/Win32.cpp
diff options
context:
space:
mode:
authordonkopunchstania <donkopunchstania@gmail.com>2010-03-06 03:25:06 +0000
committerdonkopunchstania <donkopunchstania@gmail.com>2010-03-06 03:25:06 +0000
commit6376645b6925bef5ee015452dcb5d2b1a72247cc (patch)
tree9a33c1875555eefbb3703741ce5554a359fcefdd /Source/Plugins/Plugin_VideoSoftware/Src/Win32.cpp
parentd69478e53960f0f718d4a2808b2dfcd593cf635c (diff)
Shut down the video software plugin without closing dolphin in Windows. Fixed a memory leak.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5162 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Plugins/Plugin_VideoSoftware/Src/Win32.cpp')
-rw-r--r--Source/Plugins/Plugin_VideoSoftware/Src/Win32.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/Win32.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/Win32.cpp
index 133465fe6a..ee7bad6599 100644
--- a/Source/Plugins/Plugin_VideoSoftware/Src/Win32.cpp
+++ b/Source/Plugins/Plugin_VideoSoftware/Src/Win32.cpp
@@ -201,14 +201,15 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT iMsg, WPARAM wParam, LPARAM lParam )
case WM_CLOSE:
if (m_hParent == NULL)
{
- // Simple hack to easily exit without stopping. Hope to fix the stopping errors soon.
- ExitProcess(0);
+ // Take it out of fullscreen and stop the game
+ if( g_Config.bFullscreen )
+ ToggleFullscreen(m_hParent);
+ PostMessage(m_hMain, WM_USER, WM_USER_STOP, 0);
}
break;
case WM_DESTROY:
- //Shutdown();
- //PostQuitMessage( 0 ); // Call WM_QUIT
+ Shutdown();
break;
// Called when a screensaver wants to show up while this window is active