[gnome-shell] messageTray: Prevent reentrancy issues in _updateState
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell] messageTray: Prevent reentrancy issues in _updateState
- Date: Mon, 18 Nov 2013 14:45:04 +0000 (UTC)
commit 87f0e7974993e981835907ac1fb20cb66f329e7d
Author: Jasper St. Pierre <jstpierre mecheye net>
Date: Fri Nov 15 10:34:04 2013 -0500
messageTray: Prevent reentrancy issues in _updateState
The methods we call in _updateState may not be reentrant, so make
sure that we never get into a situation where _updateState, through
some crazy chain of events, calls itself.
https://bugzilla.gnome.org/show_bug.cgi?id=711694
js/ui/messageTray.js | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
---
diff --git a/js/ui/messageTray.js b/js/ui/messageTray.js
index 2c4f823..fa24c13 100644
--- a/js/ui/messageTray.js
+++ b/js/ui/messageTray.js
@@ -2356,6 +2356,13 @@ const MessageTray = new Lang.Class({
// _updateState() figures out what (if anything) needs to be done
// at the present time.
_updateState: function() {
+ // If our state changes caused _updateState to be called,
+ // just exit now to prevent reentrancy issues.
+ if (this._updatingState)
+ return;
+
+ this._updatingState = true;
+
// Filter out acknowledged notifications.
this._notificationQueue = this._notificationQueue.filter(function(n) {
return !n.acknowledged;
@@ -2436,6 +2443,8 @@ const MessageTray = new Lang.Class({
this._showDesktopClone();
else if (desktopCloneIsVisible && !desktopCloneShouldBeVisible)
this._hideDesktopClone();
+
+ this._updatingState = false;
},
_tween: function(actor, statevar, value, params) {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]