Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-22 10:27:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix bug #59015. Gtk timers do not shut down cleanly. Remove the timer when the shutdown method is called. This should fix some crashes when the embedding widget is shut down. r=bryner,waqar sr=brendan

Browse Source
This commit is contained in:
blizzard%redhat.com 2000-11-04 16:46:02 +00:00
parent 6e970bb678
commit e145907e90
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
widget/timer/src/unix/gtk/nsTimerGtk.cpp
View File

@ -20,6 +20,7 @@
* Contributor(s):
* Stuart Parmenter <pavlov@netscape.com>
* Alexander Larsson (alla@lysator.liu.se)
* Christopher Blizzard <blizzard@mozilla.org>
*/
#define INTERVAL 10
@ -210,6 +211,7 @@ nsVoidArray *nsTimerGtk::gLowList = (nsVoidArray *)nsnull;
nsVoidArray *nsTimerGtk::gLowestList = (nsVoidArray *)nsnull;
PRBool nsTimerGtk::gTimeoutAdded = PR_FALSE;
PRBool nsTimerGtk::gProcessingTimer = PR_FALSE;
guint nsTimerGtk::gTimerID = 0;
nsTimerGtk::nsTimerGtk()
{
@ -308,7 +310,7 @@ nsresult nsTimerGtk::Init(nsTimerCallbackFunc aFunc,
nsTimerGtk::gNormalList = new nsVoidArray;
nsTimerGtk::gLowList = new nsVoidArray;
nsTimerGtk::gLowestList = new nsVoidArray;
gtk_timeout_add ( INTERVAL, TimerCallbackFunc, (gpointer) this );
gTimerID = gtk_timeout_add ( INTERVAL, TimerCallbackFunc, (gpointer)0);
nsTimerGtk::gTimeoutAdded = PR_TRUE;
}
@ -356,7 +358,7 @@ nsresult nsTimerGtk::Init(nsITimerCallback *aCallback,
nsTimerGtk::gNormalList = new nsVoidArray;
nsTimerGtk::gLowList = new nsVoidArray;
nsTimerGtk::gLowestList = new nsVoidArray;
gtk_timeout_add (INTERVAL, TimerCallbackFunc, (gpointer) this );
gTimerID = gtk_timeout_add (INTERVAL, TimerCallbackFunc, (gpointer)0);
nsTimerGtk::gTimeoutAdded = PR_TRUE;
}
@ -384,6 +386,11 @@ nsresult nsTimerGtk::Init(nsITimerCallback *aCallback,
void nsTimerGtk::Shutdown()
{
if (gTimeoutAdded) {
gtk_timeout_remove(gTimerID);
gTimerID = 0;
}
delete nsTimerGtk::gHighestList;
nsTimerGtk::gHighestList = nsnull;

1
widget/timer/src/unix/gtk/nsTimerGtk.h
View File

@ -118,6 +118,7 @@ public:
static nsVoidArray *gLowestList;
static PRBool gTimeoutAdded;
static PRBool gProcessingTimer;
static guint gTimerID;
TimeVal mSchedTime;
PRUint32 mDelay;