Attempt to fix taskbar bugs on Windows (#328, #69)

This commit is contained in:
Laurent Gomila 2013-06-17 20:57:27 +02:00
parent 4d78d02b5c
commit 5d377fdb38

View File

@ -202,7 +202,7 @@ void WindowImplWin32::processEvents()
if (!m_callback) if (!m_callback)
{ {
MSG message; MSG message;
while (PeekMessage(&message, m_handle, 0, 0, PM_REMOVE)) while (PeekMessage(&message, NULL, 0, 0, PM_REMOVE))
{ {
TranslateMessage(&message); TranslateMessage(&message);
DispatchMessage(&message); DispatchMessage(&message);
@ -884,7 +884,7 @@ LRESULT CALLBACK WindowImplWin32::globalOnEvent(HWND handle, UINT message, WPARA
} }
// Get the WindowImpl instance corresponding to the window handle // Get the WindowImpl instance corresponding to the window handle
WindowImplWin32* window = reinterpret_cast<WindowImplWin32*>(GetWindowLongPtr(handle, GWLP_USERDATA)); WindowImplWin32* window = handle ? reinterpret_cast<WindowImplWin32*>(GetWindowLongPtr(handle, GWLP_USERDATA)) : NULL;
// Forward the event to the appropriate function // Forward the event to the appropriate function
if (window) if (window)