Merge pull request #78 from joachimvalente/patch-1

fix onListen for 0 queued isolates

Author: nmfisher

android/src/main/java/com/rmawatson/flutterisolate/FlutterIsolatePlugin.java

@@ -138,14 +138,17 @@ private void startNextIsolate() {
 
     @Override
     public void onListen(Object o, EventChannel.EventSink sink) {
-        IsolateHolder isolate = queuedIsolates.remove();
-        sink.success(isolate.isolateId);
-        sink.endOfStream();
-        activeIsolates.put(isolate.isolateId, isolate);
-
-        isolate.result.success(null);
-        isolate.startupChannel = null;
-        isolate.result = null;
+        if (queuedIsolates.size() != 0) {
+            IsolateHolder isolate = queuedIsolates.remove();
+        
+            sink.success(isolate.isolateId);
+            sink.endOfStream();
+            activeIsolates.put(isolate.isolateId, isolate);
+
+            isolate.result.success(null);
+            isolate.startupChannel = null;
+            isolate.result = null;
+        }
 
         if (queuedIsolates.size() != 0) {
             startNextIsolate();

ios/Classes/FlutterIsolatePlugin.m

@@ -143,14 +143,16 @@ - (FlutterError*)onListenWithArguments:(id)arguments eventSink:(FlutterEventSink
 
     IsolateHolder* isolate = _queuedIsolates.firstObject;
 
-    sink(isolate.isolateId);
-    sink(FlutterEndOfEventStream);
-    _activeIsolates[isolate.isolateId] = isolate;
-    [_queuedIsolates removeObject:isolate];
-
-    isolate.result(@(YES));
-    isolate.startupChannel = nil;
-    isolate.result = nil;
+    if (isolate != nil) {
+        sink(isolate.isolateId);
+        sink(FlutterEndOfEventStream);
+        _activeIsolates[isolate.isolateId] = isolate;
+        [_queuedIsolates removeObject:isolate];
+
+        isolate.result(@(YES));
+        isolate.startupChannel = nil;
+        isolate.result = nil;
+    }
 
     if (_queuedIsolates.count != 0)
         [self startNextIsolate];