Skip to content

Commit 6da64f8

Browse files
dsward2dsward2
authored andcommitted
In TaskItem terminateTask, make repeated calls to NSTask terminate until NSTask isRunning returns false.
1 parent 39d0d92 commit 6da64f8

2 files changed

Lines changed: 7 additions & 5 deletions

File tree

LocalRadio/TaskItem.m

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,12 +128,14 @@ - (NSError *) terminateTask
128128
{
129129
[self.task terminate];
130130

131-
/*
131+
[NSThread sleepForTimeInterval:0.1f];
132+
132133
while ([self.task isRunning] == YES)
133134
{
135+
[self.task terminate];
136+
134137
[NSThread sleepForTimeInterval:0.1f];
135138
}
136-
*/
137139

138140
return NULL;
139141
}

LocalRadio/TaskPipelineManager.m

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,10 +115,10 @@ - (void) startTasks
115115

116116
- (void) terminateTasks
117117
{
118-
NSArray * reversedTaskItemsArray = [[self.taskItemsArray reverseObjectEnumerator] allObjects];
118+
//NSArray * reversedTaskItemsArray = [[self.taskItemsArray reverseObjectEnumerator] allObjects];
119119

120-
for (TaskItem * taskItem in reversedTaskItemsArray)
121-
//for (TaskItem * taskItem in self.taskItemsArray)
120+
//for (TaskItem * taskItem in reversedTaskItemsArray)
121+
for (TaskItem * taskItem in self.taskItemsArray)
122122
{
123123
NSError * terminateTaskError = [taskItem terminateTask];
124124
}

0 commit comments

Comments
 (0)