fixed oneshot Observable.TimerFrame send OnCompleted

neuecc · Mar 13, 2015 · 27fe3b4 · 27fe3b4
1 parent 0995bb2
commit 27fe3b4
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/Assets/UniRx/Scripts/UnityEngineBridge/Observable.Unity.cs b/Assets/UniRx/Scripts/UnityEngineBridge/Observable.Unity.cs
@@ -301,8 +301,8 @@ static IEnumerator NextFrameCore(IObserver<Unit> observer, FrameCountType frameC
             if (!cancellation.IsCancellationRequested)
             {
                 observer.OnNext(Unit.Default);
+                observer.OnCompleted();
             }
-			observer.OnCompleted();
         }
 
         public static IObservable<long> IntervalFrame(int intervalFrameCount, FrameCountType frameCountType = FrameCountType.Update)
@@ -333,6 +333,7 @@ static IEnumerator TimerFrameCore(IObserver<long> observer, int dueTimeFrameCoun
                 if (currentFrame++ == dueTimeFrameCount)
                 {
                     observer.OnNext(0);
+                    observer.OnCompleted();
                     break;
                 }
                 yield return frameCountType.GetYieldInstruction();