From 951cdb46530da9450cc234e405f9e2c28e86a10e Mon Sep 17 00:00:00 2001
From: cybice <istarkov@gmail.com>
Date: Sat, 27 Jun 2015 17:13:32 +0300
Subject: [PATCH] fix: Move dispose after new observable description, add check
 on non existed prev

---
 src/AsyncComponent.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/AsyncComponent.js b/src/AsyncComponent.js
index f49e9f6..7ac571b 100644
--- a/src/AsyncComponent.js
+++ b/src/AsyncComponent.js
@@ -167,7 +167,6 @@ export default class AsyncComponent extends React.Component {
       if (prev !== undefined && prev.id === next.id) {
         this.observed[name] = prev;
       } else {
-        prev.subscription.dispose();
         next.observable = next.start();
         next.subscription = next.observable.subscribe({
           onNext: this._onNext.bind(this, name),
@@ -175,6 +174,9 @@ export default class AsyncComponent extends React.Component {
           onError: this._onError.bind(this, name)
         });
         this.observed[name] = next;
+        if (prev !== undefined) {
+          prev.subscription.dispose();
+        }
       }
     }