Merge branch 'master' into stable

nylas · Sep 29, 2016 · bb37e19 · bb37e19
2 parents 62debad + 9f0a2c3
commit bb37e19
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/components/list-data-source.coffee b/src/components/list-data-source.coffee
@@ -26,9 +26,10 @@ class ListDataSource
 
     return =>
       @_emitter.removeListener('trigger', eventHandler)
-      if @_emitter.listenerCount('trigger') is 0
-        @_cleanedup = true
-        @cleanup()
+      process.nextTick =>
+        if @_emitter.listenerCount('trigger') is 0
+          @_cleanedup = true
+          @cleanup()
 
   loaded: ->
     throw new Error("ListDataSource base class does not implement loaded()")