[[ Bug 13650 ]] Prevent a crash when opening stack

livecodepanos · livecodepanos · commit 608e4413fcf8 · 2014-10-14T13:31:05.000+01:00
diff --git a/docs/notes/bugfix-13650.md b/docs/notes/bugfix-13650.md
@@ -0,0 +1 @@
+#     Crash when opening stack
diff --git a/engine/src/mac-av-player.mm b/engine/src/mac-av-player.mm
@@ -190,11 +190,16 @@ - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(N
         MCPlatformBreakWait();
     else if([keyPath isEqualToString: @"currentItem.loadedTimeRanges"])
     {
-        NSArray *t_time_ranges = (NSArray *)[change objectForKey:NSKeyValueChangeNewKey];
-        if (t_time_ranges && [t_time_ranges count])
+        // PM-2014-10-14: [[ Bug 13650 ]] Do this check to prevent a crash
+        if([change objectForKey:NSKeyValueChangeNewKey] != [NSNull null])
         {
-            CMTimeRange timerange = [[t_time_ranges objectAtIndex:0] CMTimeRangeValue];
-            m_av_player -> MovieIsLoading(timerange);
+            NSArray *t_time_ranges = (NSArray *)[change objectForKey:NSKeyValueChangeNewKey];
+            
+            if (t_time_ranges && [t_time_ranges count])
+            {
+                CMTimeRange timerange = [[t_time_ranges objectAtIndex:0] CMTimeRangeValue];
+                m_av_player -> MovieIsLoading(timerange);
+            }
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -190,11 +190,16 @@ - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(N`
`190`	`190`	`MCPlatformBreakWait();`
`191`	`191`	`else if([keyPath isEqualToString: @"currentItem.loadedTimeRanges"])`
`192`	`192`	`{`
`193`		`- NSArray t_time_ranges = (NSArray )[change objectForKey:NSKeyValueChangeNewKey];`
`194`		`- if (t_time_ranges && [t_time_ranges count])`
	`193`	`+ // PM-2014-10-14: [[ Bug 13650 ]] Do this check to prevent a crash`
	`194`	`+ if([change objectForKey:NSKeyValueChangeNewKey] != [NSNull null])`
`195`	`195`	`{`
`196`		`- CMTimeRange timerange = [[t_time_ranges objectAtIndex:0] CMTimeRangeValue];`
`197`		`- m_av_player -> MovieIsLoading(timerange);`
	`196`	`+ NSArray t_time_ranges = (NSArray )[change objectForKey:NSKeyValueChangeNewKey];`
	`197`	`+`
	`198`	`+ if (t_time_ranges && [t_time_ranges count])`
	`199`	`+ {`
	`200`	`+ CMTimeRange timerange = [[t_time_ranges objectAtIndex:0] CMTimeRangeValue];`
	`201`	`+ m_av_player -> MovieIsLoading(timerange);`
	`202`	`+ }`
`198`	`203`	`}`
`199`	`204`	`}`
`200`	`205`	`}`