Allow 'current context' to work in AppleScript when multiple contexts are enabled

Source/AppleScript.m

@@ -14,7 +14,7 @@ @implementation NSApplication (AppleScript)
 // current context property
 
 - (NSString *) currentContext {
-	return [[NSApp delegate] currentContextPath];
+	return [[NSApp delegate] currentContextAsString];
 }
 
 - (void) setCurrentContext: (NSString*) newContext {

Source/CPController.h

@@ -41,6 +41,8 @@
 - (void)resumeRegularUpdates;
 - (void)resumeRegularUpdatesWithDelay:(int64_t)nanoseconds;
 - (void)forceUpdate;
+
+- (NSString*)currentContextAsString;
 + (NSSet *) sharedActiveContexts;
 
 @end

Source/CPController.m

@@ -773,9 +773,7 @@ - (void)updateMenuBarAndContextMenu {
                 [_joinedContextPaths appendString:context.name]; //[contextsDataSource pathFromRootTo:context.uuid]];
              }
              self.currentContextPath=_joinedContextPaths;*/
-            NSSortDescriptor *sortKey=[NSSortDescriptor sortDescriptorWithKey:@"name" ascending:TRUE];
-            NSArray *keyArray=[NSArray arrayWithObject:sortKey];
-            self.currentContextPath=[[self.activeContexts sortedArrayUsingDescriptors:keyArray] componentsJoinedByString:@" + "]; // sans context-paths, to conserve space. perhaps we'll add a pref to switch it on (above).
+            self.currentContextPath=[self currentContextAsString];
         }
         [self setStatusTitle:[self currentContextPath]];
     }
@@ -1968,4 +1966,16 @@ - (void) observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(
             break;
     }
 }
+
+- (NSString*) currentContextAsString {
+    if ([self useMultipleActiveContexts]) {
+        NSSortDescriptor *sortKey=[NSSortDescriptor sortDescriptorWithKey:@"name" ascending:TRUE];
+        NSArray *keyArray=[NSArray arrayWithObject:sortKey];
+        NSArray* aca = [self.activeContexts sortedArrayUsingDescriptors:keyArray];
+        NSString* acas = [aca componentsJoinedByString:@" + "];
+        return acas;
+    } else {
+        return self.currentContextPath;
+    }
+}
 @end