Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug #54725 (r=kmcclusk@netscape.com, sr=brendan@mozilla.org). Java plugin causes app to hang on shutdown.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@82053 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
rpotts%netscape.com
2000-10-30 22:43:21 +00:00
parent c46c0ae498
commit 94a6da09be
1 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
mozilla/widget/src/windows/nsAppShell.cpp
View File

@@ -39,6 +39,7 @@ static NS_DEFINE_CID(kTimerManagerCID, NS_TIMERMANAGER_CID);
NS_IMPL_ISUPPORTS(nsAppShell, NS_IAPPSHELL_IID)
static int gKeepGoing = 1;
//-------------------------------------------------------------------------
//
// nsAppShell constructor
@@ -86,6 +87,7 @@ NS_METHOD nsAppShell::Run(void)
NS_WITH_SERVICE(nsITimerQueue, queue, kTimerManagerCID, &rv);
if (NS_FAILED(rv)) return rv;
gKeepGoing = 1;
// Process messages
do {
// Give priority to system messages (in particular keyboard, mouse,
@@ -116,8 +118,16 @@ NS_METHOD nsAppShell::Run(void)
!::PeekMessage(&msg, NULL, 0, 0, PM_NOREMOVE));
} else {
// Block and wait for any posted application message
::WaitMessage();
if (!gKeepGoing) {
// In this situation, PostQuitMessage() was called, but the WM_QUIT
// message was removed from the event queue by someone else -
// (see bug #54725). So, just exit the loop as if WM_QUIT had been
// reeceived...
keepGoing = 0;
} else {
// Block and wait for any posted application message
::WaitMessage();
}
}
} while (keepGoing != 0);
@@ -199,6 +209,11 @@ nsresult nsAppShell::DispatchNativeEvent(PRBool aRealEvent, void *aEvent)
NS_METHOD nsAppShell::Exit(void)
{
PostQuitMessage(0);
//
// Also, set a global flag, just in case someone eats the WM_QUIT message.
// see bug #54725.
//
gKeepGoing = 0;
return NS_OK;
}