Fixed invalid usage of JS-like OR

TheWidlarzGroup · May 11, 2015 · 9900a9c · 9900a9c
1 parent 1cbe182
commit 9900a9c
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/RCTVideo.m b/RCTVideo.m
@@ -135,8 +135,14 @@ - (AVPlayerItem*)playerItemForSource:(NSDictionary *)source {
 - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context {
   if (object == _playerItem) {
     if (_playerItem.status == AVPlayerItemStatusReadyToPlay) {
+      float duration = CMTimeGetSeconds(_playerItem.asset.duration);
+
+      if (isnan(duration)) {
+        duration = 0.0;
+      }
+
       [_eventDispatcher sendInputEventWithName:RNVideoEventLoaded body:@{
-        @"duration": [NSNumber numberWithFloat:(CMTimeGetSeconds(_playerItem.duration) || 0.0)],
+        @"duration": [NSNumber numberWithFloat:duration],
         @"currentTime": [NSNumber numberWithFloat:CMTimeGetSeconds(_playerItem.currentTime)],
         @"canPlayReverse": [NSNumber numberWithBool:_playerItem.canPlayReverse],
         @"canPlayFastForward": [NSNumber numberWithBool:_playerItem.canPlayFastForward],