nzp-team/fteqw
0
0
Fork 0
mirror of https://github.com/nzp-team/fteqw.git synced 2024-11-23 04:11:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixes taskswitch bugs.

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@1671 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2005-12-06 02:19:22 +00:00
parent 880681a390
commit 688bae5fdb
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
engine/gl/gl_vidnt.c
View file

@ -128,7 +128,7 @@ modestate_t modestate = MS_UNINIT;
LONG WINAPI GLMainWndProc (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); LONG WINAPI GLMainWndProc (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
void GLAppActivate(BOOL fActive, BOOL minimize); qboolean GLAppActivate(BOOL fActive, BOOL minimize);
char *VID_GetModeDescription (int mode); char *VID_GetModeDescription (int mode);
void ClearAllStates (void); void ClearAllStates (void);
void VID_UpdateWindowStatus (void); void VID_UpdateWindowStatus (void);
@ -1067,7 +1067,7 @@ void ClearAllStates (void)
IN_ClearStates (); IN_ClearStates ();
} }
void GLAppActivate(BOOL fActive, BOOL minimize) qboolean GLAppActivate(BOOL fActive, BOOL minimize)
/**************************************************************************** /****************************************************************************
* *
* Function: AppActivate * Function: AppActivate
@ -1081,6 +1081,9 @@ void GLAppActivate(BOOL fActive, BOOL minimize)
{ {
static BOOL sound_active; static BOOL sound_active;
if (ActiveApp == fActive && Minimized == minimize)
return false; //so windows doesn't crash us over and over again.
ActiveApp = fActive; ActiveApp = fActive;
Minimized = minimize; Minimized = minimize;
@ -1151,6 +1154,8 @@ void GLAppActivate(BOOL fActive, BOOL minimize)
} }
vid_hardwaregamma.modified = true; vid_hardwaregamma.modified = true;
return true;
} }
@ -1292,15 +1297,10 @@ LONG WINAPI GLMainWndProc (
break; break;
case WM_ACTIVATE: case WM_ACTIVATE:
if (fActive == LOWORD(wParam))
if (fMinimized == (BOOL) HIWORD(wParam))
//so, urm, tell me microsoft, what changed?
break;
fActive = LOWORD(wParam); fActive = LOWORD(wParam);
fMinimized = (BOOL) HIWORD(wParam); fMinimized = (BOOL) HIWORD(wParam);
GLAppActivate(!(fActive == WA_INACTIVE), fMinimized); if (!GLAppActivate(!(fActive == WA_INACTIVE), fMinimized))
break;//so, urm, tell me microsoft, what changed?
if (modestate == MS_FULLDIB) if (modestate == MS_FULLDIB)
ShowWindow(mainwindow, SW_SHOWNORMAL); ShowWindow(mainwindow, SW_SHOWNORMAL);