- Fix return to previously active window. See CORE-106.
svn path=/trunk/; revision=66055
*/
if (!co_WinPosShowWindow(Window, SW_HIDE))
{ // Rule #1.
- if (ti->MessageQueue->spwndActive == Window && ti->MessageQueue == IntGetFocusMessageQueue())
+ if ( ti->MessageQueue->spwndActive == Window ||
+ (ti->MessageQueue->spwndActive == NULL && ti->MessageQueue == IntGetFocusMessageQueue()) )
{
co_WinPosActivateOtherWindow(Window);
}
{
WndTo = Wnd->head.pti->MessageQueue->spwndActivePrev;
if (can_activate_window( WndTo )) goto done;
+
}
- // Find any window to bring to top. Works Okay for wine.
+ // Find any window to bring to top. Works Okay for wine since it does not see X11 windows.
WndTo = UserGetDesktopWindow();
WndTo = WndTo->spwndChild;
+ if ( WndTo == NULL )
+ {
+ return;
+ }
for (;;)
{
if (WndTo == Wnd)