diff --git a/Frameworks/DocumentWindow/src/DocumentController.mm b/Frameworks/DocumentWindow/src/DocumentController.mm index 4ae333ce..33fe3ee2 100644 --- a/Frameworks/DocumentWindow/src/DocumentController.mm +++ b/Frameworks/DocumentWindow/src/DocumentController.mm @@ -19,7 +19,6 @@ #import #import #import -#import #import #import #import @@ -652,7 +651,7 @@ namespace OakShowAlertForWindow(alert, self.window, ^(NSInteger returnCode){ if(returnCode == NSAlertDefaultReturn) /* "Stop" */ { - oak::kill_process_group_in_background(_runner->process_id()); + [_htmlOutputView stopLoading]; _runner.reset(); [sender performSelector:@selector(performClose:) withObject:self afterDelay:0]; } @@ -1290,7 +1289,7 @@ namespace auto sheetResponseHandler = ^(NSInteger returnCode){ if(returnCode == NSAlertDefaultReturn) /* "Stop" */ { - oak::kill_process_group_in_background(candidate.commandRunner->process_id()); + [candidate.htmlOutputView stopLoading]; dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{ candidate.commandRunner->wait_for_command(); // Must not be called in main queue dispatch_async(dispatch_get_main_queue(), ^{ diff --git a/Frameworks/HTMLOutputWindow/src/HTMLOutputWindow.mm b/Frameworks/HTMLOutputWindow/src/HTMLOutputWindow.mm index 286a5646..b5861071 100644 --- a/Frameworks/HTMLOutputWindow/src/HTMLOutputWindow.mm +++ b/Frameworks/HTMLOutputWindow/src/HTMLOutputWindow.mm @@ -1,7 +1,6 @@ #import "HTMLOutputWindow.h" #import #import -#import #import #import @@ -108,7 +107,7 @@ OAK_DEBUG_VAR(HTMLOutputWindow); if(returnCode == NSAlertDefaultReturn) /* "Stop" */ { [self.window orderOut:self]; - oak::kill_process_group_in_background(_commandRunner->process_id()); + [self.htmlOutputView stopLoading]; [self.window close]; } }); diff --git a/Frameworks/HTMLOutputWindow/target b/Frameworks/HTMLOutputWindow/target index 4326a7ce..f2465ac3 100644 --- a/Frameworks/HTMLOutputWindow/target +++ b/Frameworks/HTMLOutputWindow/target @@ -1,4 +1,4 @@ SOURCES = src/*.mm EXPORT = src/HTMLOutputWindow.h -LINK += HTMLOutput OakAppKit OakFoundation OakSystem command +LINK += HTMLOutput OakAppKit OakFoundation command FRAMEWORKS = Cocoa