Changeset 11688 for trunk/macosx/Controller.m

Timestamp:

Jan 15, 2011, 6:44:39 PM (11 years ago)

Author:

livings124

Message:

#3686 "add rpc command to cleanly shutdown daemon" - added for Mac client

File:

• trunk/macosx/Controller.m (modified) (4 diffs)

trunk/macosx/Controller.m

@@ -391 +391 @@
         
         [[SUUpdater sharedUpdater] setDelegate: self];
-        fUpdateInProgress = NO;
+        fQuitRequested = NO;
         
         fPauseOnLaunch = (GetCurrentKeyModifiers() & (optionKey | rightOptionKey)) != 0;
@@ -678 +678 @@
 - (NSApplicationTerminateReply) applicationShouldTerminate: (NSApplication *) sender
 {
-    if (!fUpdateInProgress && [fDefaults boolForKey: @"CheckQuit"])
+    if (!fQuitRequested && [fDefaults boolForKey: @"CheckQuit"])
     {
         NSInteger active = 0, downloading = 0;
@@ -4359 +4359 @@
 - (void) updaterWillRelaunchApplication: (SUUpdater *) updater
 {
-    fUpdateInProgress = YES;
+    fQuitRequested = YES;
 }
 
@@ -4441 +4441 @@
             break;
         
+        case TR_RPC_SESSION_CLOSE:
+            fQuitRequested = YES;
+            [NSApp performSelectorOnMainThread: @selector(terminate:) withObject: self waitUntilDone: NO];
+            break;
+        
         default:
             NSAssert1(NO, @"Unknown RPC command received: %d", type);