forked from bartvdbraak/blender
CMake + MSVC debug build fix
Initializing lResult = 0; and removing NOP (if(!lResult) lResult = 0; That was discussed with Genscher and Benoit in IRC.
This commit is contained in:
parent
d35a556d66
commit
379f02f6e6
@ -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)
|
LRESULT WINAPI GHOST_SystemWin32::s_wndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
|
||||||
{
|
{
|
||||||
GHOST_Event* event = 0;
|
GHOST_Event* event = 0;
|
||||||
LRESULT lResult;
|
LRESULT lResult = 0;
|
||||||
GHOST_SystemWin32* system = ((GHOST_SystemWin32*)getSystem());
|
GHOST_SystemWin32* system = ((GHOST_SystemWin32*)getSystem());
|
||||||
GHOST_ASSERT(system, "GHOST_SystemWin32::s_wndProc(): system not initialized")
|
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) {
|
if (event) {
|
||||||
system->pushEvent(event);
|
system->pushEvent(event);
|
||||||
if(!lResult) //WM_ACTIVATE might have returned something.
|
|
||||||
lResult = 0;
|
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
lResult = ::DefWindowProc(hwnd, msg, wParam, lParam);
|
lResult = ::DefWindowProc(hwnd, msg, wParam, lParam);
|
||||||
|
Loading…
Reference in New Issue
Block a user