Fix ScopedObserver move assignment

kylefleming · kylefleming · commit a3044fee314c · 2015-08-05T21:16:58.000-07:00
diff --git a/include/react/Observer.h b/include/react/Observer.h
@@ -130,6 +130,7 @@ class ScopedObserver
     ScopedObserver& operator=(ScopedObserver&& other)
     {
         obs_ = std::move(other.obs_);
+        return *this;
     }
 
     // Deleted default ctor, copy ctor and assignment
@@ -139,7 +140,8 @@ class ScopedObserver
 
     ~ScopedObserver()
     {
-        obs_.Detach();
+        if (obs_.IsValid())
+            obs_.Detach();
     }
 
     bool IsValid() const

Original file line number	Diff line number	Diff line change
`@@ -130,6 +130,7 @@ class ScopedObserver`
`130`	`130`	`ScopedObserver& operator=(ScopedObserver&& other)`
`131`	`131`	`{`
`132`	`132`	`obs_ = std::move(other.obs_);`
	`133`	`+ return *this;`
`133`	`134`	`}`
`134`	`135`
`135`	`136`	`// Deleted default ctor, copy ctor and assignment`
`@@ -139,7 +140,8 @@ class ScopedObserver`
`139`	`140`
`140`	`141`	`~ScopedObserver()`
`141`	`142`	`{`
`142`		`- obs_.Detach();`
	`143`	`+ if (obs_.IsValid())`
	`144`	`+ obs_.Detach();`
`143`	`145`	`}`
`144`	`146`
`145`	`147`	`bool IsValid() const`