From bcd48b7d21f2fd74806ef0b02cfc100610ca4e20 Mon Sep 17 00:00:00 2001
From: Johannes Lumpe <johannes@johanneslumpe.de>
Date: Mon, 11 May 2015 09:54:58 +0300
Subject: [PATCH] Fixed invalid usage of JS-like OR

---
 .../UserInterfaceState.xcuserstate            | Bin 28585 -> 28585 bytes
 RCTVideo.m                                    |   9 +++++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/Examples/VideoPlayer/VideoPlayer.xcodeproj/project.xcworkspace/xcuserdata/brentvatne.xcuserdatad/UserInterfaceState.xcuserstate b/Examples/VideoPlayer/VideoPlayer.xcodeproj/project.xcworkspace/xcuserdata/brentvatne.xcuserdatad/UserInterfaceState.xcuserstate
index 4eed5183d7ee989bf308c0dcf4a70c5cdb8b0fbc..7b8c98fd1dd385c83334c6fb164dac00f1241a66 100644
GIT binary patch
delta 37
qcmZ2^pK;}V#tlA(Y>W&6%$naOKMWJyoNid63g)+~Z+;kdLIMB<Q4LN2

delta 37
qcmZ2^pK;}V#tlA(Yz+Uue~s#!{4h*(bGl)PDwx0R@aBhMCnNw}-4hT1

diff --git a/RCTVideo.m b/RCTVideo.m
index ad2d7b8a..be64ea4b 100644
--- a/RCTVideo.m
+++ b/RCTVideo.m
@@ -144,9 +144,14 @@ static NSString *const statusKeyPath = @"status";
 - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context {
   if (object == _playerItem) {
     if (_playerItem.status == AVPlayerItemStatusReadyToPlay) {
-      // NSLog(@"duration: %f",CMTimeGetSeconds(_playerItem.asset.duration));
+      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],