In TaskPipelineManager, a new kTaskPipelineStatusTerminating status c…

…ode was added between the kTaskPipelineStatusRunning and kTaskPipelineStatusTerminated phases.

In TaskPipelineManager terminateTasks, the @synchronized directive was used in a critical section of code, and the result of NSTask isRunning is checked before sending the terminate message.  This should avoid some crashes that occurred when terminate was sent to an NSTask that had already terminated.

Also, the NSTask terminate section of code is now enclosed in a @try/@catch block to avoid app crashes.

LocalRadio/Info.plist

@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.12</string>
+	<string>1.13</string>
 	<key>CFBundleVersion</key>
-	<string>13</string>
+	<string>14</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.entertainment</string>
 	<key>LSMinimumSystemVersion</key>

LocalRadio/TaskPipelineManager.h

@@ -10,7 +10,8 @@
 
 #define kTaskPipelineStatusIdle 0
 #define kTaskPipelineStatusRunning 1
-#define kTaskPipelineStatusTerminated 2
+#define kTaskPipelineStatusTerminating 2
+#define kTaskPipelineStatusTerminated 3
 
 @class TaskItem;
 

LocalRadio/TaskPipelineManager.m

@@ -118,9 +118,6 @@ - (void) startTasks
 
     [self configureTaskPipes];
 
-    //NSArray * reversedTaskItemsArray = [[self.taskItemsArray reverseObjectEnumerator] allObjects];
-
-    //for (TaskItem * taskItem in reversedTaskItemsArray)
     for (TaskItem * taskItem in self.taskItemsArray)
     {
         NSError * startTaskError = [taskItem startTask];
@@ -136,19 +133,29 @@ - (void) startTasks
 
 - (void) terminateTasks
 {
-    //NSArray * reversedTaskItemsArray = [[self.taskItemsArray reverseObjectEnumerator] allObjects];
-
-    //for (TaskItem * taskItem in reversedTaskItemsArray)
-    for (TaskItem * taskItem in self.taskItemsArray)
+    @synchronized (self)
     {
-        NSError * terminateTaskError = [taskItem terminateTask];
-    }
-
-    [self.taskItemsArray removeAllObjects];
+        self.taskPipelineStatus = kTaskPipelineStatusTerminating;
 
-    self.taskPipelineStatus = kTaskPipelineStatusTerminated;
+        for (TaskItem * taskItem in self.taskItemsArray)
+        {
+            if (taskItem.task.isRunning == YES)
+            {
+                @try {
+                    NSError * terminateTaskError = [taskItem terminateTask];
+                }
+                @catch (NSException *exception) {
+
+                }
+            }
+        }
+
+        [self.taskItemsArray removeAllObjects];
+    }
 
     [NSThread sleepForTimeInterval:0.1f];
+
+    self.taskPipelineStatus = kTaskPipelineStatusTerminated;
 }