From 379f02f6e60d6592d7579e67a167026018dc27e1 Mon Sep 17 00:00:00 2001 From: Dalai Felinto Date: Mon, 18 May 2009 21:05:21 +0000 Subject: CMake + MSVC debug build fix Initializing lResult = 0; and removing NOP (if(!lResult) lResult = 0; That was discussed with Genscher and Benoit in IRC. --- intern/ghost/intern/GHOST_SystemWin32.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'intern') diff --git a/intern/ghost/intern/GHOST_SystemWin32.cpp b/intern/ghost/intern/GHOST_SystemWin32.cpp index b265353144d..2cee48032f5 100644 --- a/intern/ghost/intern/GHOST_SystemWin32.cpp +++ b/intern/ghost/intern/GHOST_SystemWin32.cpp @@ -537,7 +537,7 @@ GHOST_Event* GHOST_SystemWin32::processWindowEvent(GHOST_TEventType type, GHOST_ LRESULT WINAPI GHOST_SystemWin32::s_wndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { GHOST_Event* event = 0; - LRESULT lResult; + LRESULT lResult = 0; GHOST_SystemWin32* system = ((GHOST_SystemWin32*)getSystem()); GHOST_ASSERT(system, "GHOST_SystemWin32::s_wndProc(): system not initialized") @@ -908,8 +908,6 @@ LRESULT WINAPI GHOST_SystemWin32::s_wndProc(HWND hwnd, UINT msg, WPARAM wParam, if (event) { system->pushEvent(event); - if(!lResult) //WM_ACTIVATE might have returned something. - lResult = 0; } else { lResult = ::DefWindowProc(hwnd, msg, wParam, lParam); -- cgit v1.2.3