Merge branch 'master' into 4.0.x (drop events before startup)

This commit is contained in:
Andrew Grieve 2015-01-05 16:33:05 -05:00
commit 9698a995fb

View File

@ -315,7 +315,9 @@ public class CoreAndroid extends CordovaPlugin {
}
PluginResult pluginResult = new PluginResult(PluginResult.Status.OK, obj);
pluginResult.setKeepCallback(true);
messageChannel.sendPluginResult(pluginResult);
if (messageChannel != null) {
messageChannel.sendPluginResult(pluginResult);
}
}
/*