Skip to content

Commit 552a180

Browse files
committed
add __discarded flag and ignore delayed action if discarded
1 parent 1bfbe7c commit 552a180

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

core/Context.qml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,11 +142,13 @@ Item {
142142

143143
///@private
144144
function delayedAction(name, self, method, delay) {
145-
if (!self._registerDelayedAction(name))
145+
if (self.__discarded || !self._registerDelayedAction(name))
146146
return
147147

148148
var callback = function() {
149149
self._cancelDelayedAction(name)
150+
if (self.__discarded)
151+
return
150152
method.call(self)
151153
}
152154

core/EventEmitter.qml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ CoreObject {
1414
}
1515

1616
function discard() {
17+
this.__discarded = true
1718
this.removeAllOn()
1819
for(var name in this._eventHandlers)
1920
this.removeAllListeners(name)

0 commit comments

Comments
 (0)