Fix rare crash when closing a document.

wix-incubator · Dec 5, 2018 · b981abc · b981abc
1 parent 2fb91eb
commit b981abc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/DetoxInstruments/DetoxInstruments/DTXApplicationDelegate.m b/DetoxInstruments/DetoxInstruments/DTXApplicationDelegate.m
@@ -95,6 +95,7 @@ - (void)verifyLldbInitIsNotBroken
 - (void)applicationDidFinishLaunching:(NSNotification *)aNotification
 {
 	[[NSUserDefaults standardUserDefaults] registerDefaults:@{@"DTXProfilingConfigurationUseDefaultConfiguration": @YES}];
+	[[NSUserDefaults standardUserDefaults] registerDefaults:@{@"DTXSelectedProfilingConfiguration_timeLimit": @2}];
 	[[NSUserDefaults standardUserDefaults] registerDefaults:@{@"DTXSelectedProfilingConfiguration_timeLimitType": @1}];
 
 	if([[NSUserDefaults standardUserDefaults] boolForKey:@"DTXProfilingConfigurationUseDefaultConfiguration"])

diff --git a/DetoxInstruments/DetoxInstruments/Document/DTXRecordingDocument.m b/DetoxInstruments/DetoxInstruments/Document/DTXRecordingDocument.m
@@ -442,7 +442,7 @@ - (NSString *)defaultDraftName
 - (void)canCloseDocumentWithDelegate:(id)delegate shouldCloseSelector:(SEL)shouldCloseSelector contextInfo:(void *)contextInfo
 {
 #ifndef CLI
-	if(self.documentState < DTXRecordingDocumentStateLiveRecordingFinished)
+	if(self.documentState == DTXRecordingDocumentStateLiveRecording)
 	{
 		[self stopLiveRecording];
 	}
@@ -482,8 +482,11 @@ - (void)popGroup
 
 - (void)stopLiveRecording
 {
-	dispatch_block_cancel(_pendingCancelBlock);
-	_pendingCancelBlock = nil;
+	if(_pendingCancelBlock != nil)
+	{
+		dispatch_block_cancel(_pendingCancelBlock);
+		_pendingCancelBlock = nil;
+	}
 
 	[self remoteProfilingClientDidStopRecording:_remoteProfilingClient];