don't clobber the icon state from the timer, required since boot2dock…

…er doesn't have intermediate states
nickgartmann · Mar 15, 2015 · 25275c4 · 25275c4
1 parent 73c99a1
commit 25275c4
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 9 deletions.
diff --git a/...Status.xcodeproj/xcuserdata/nickgartmann.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/...Status.xcodeproj/xcuserdata/nickgartmann.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -10,13 +10,13 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "Boot2Docker Status/AppDelegate.m"
-            timestampString = "448072377.648191"
+            timestampString = "448128589.476755"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "101"
-            endingLineNumber = "101"
-            landmarkName = "-shouldDisplayWindowOnBoot"
-            landmarkType = "5">
+            startingLineNumber = "15"
+            endingLineNumber = "15"
+            landmarkName = "haveRequestedShutdown"
+            landmarkType = "19">
          </BreakpointContent>
       </BreakpointProxy>
    </Breakpoints>

diff --git a/Boot2Docker Status/AppDelegate.m b/Boot2Docker Status/AppDelegate.m
@@ -12,6 +12,7 @@
 @interface AppDelegate ()
 @property (weak) NSUserDefaults *standardUserDefaults;
 @property (weak) IBOutlet NSWindow *window;
+@property BOOL haveRequestedStateChange;
 @end
 
 
@@ -22,6 +23,8 @@ @implementation AppDelegate
 - (void)applicationDidFinishLaunching:(NSNotification *)aNotification {
     // Insert code here to initialize your application
 
+    _haveRequestedStateChange = NO;
+
 
     _statusItem = [[NSStatusBar systemStatusBar] statusItemWithLength:NSVariableStatusItemLength];
 
@@ -117,10 +120,12 @@ - (void)toggleBoot2Docker:(id)sender {
 }
 
 - (void)renderIcon:(id)sender {
-    if([self isBoot2DockerRunning]) {
-        _statusItem.image = [NSImage imageNamed:@"docker"];
-    } else {
-        _statusItem.image = [NSImage imageNamed:@"docker-alt"];
+    if(!_haveRequestedStateChange) {
+        if([self isBoot2DockerRunning]) {
+            _statusItem.image = [NSImage imageNamed:@"docker"];
+        } else {
+            _statusItem.image = [NSImage imageNamed:@"docker-alt"];
+        }
     }
 }
 
@@ -146,23 +151,27 @@ - (BOOL)isBoot2DockerRunning {
 }
 
 - (void)startBoot2Docker {
+    _haveRequestedStateChange = YES;
     NSTask *task = [[NSTask alloc] init];
     [task setLaunchPath:@"/bin/bash"];
     [task setArguments:@[@"-c", @"/usr/local/bin/boot2docker up"]];
 
     [task setTerminationHandler:^(NSTask *t) {
+        _haveRequestedStateChange = NO;
         _statusItem.image = [NSImage imageNamed:@"docker"];
     }];
 
     [task launch];
 }
 
 - (void)stopBoot2Docker {
+    _haveRequestedStateChange = YES;
     NSTask *task = [[NSTask alloc] init];
     [task setLaunchPath:@"/bin/bash"];
     [task setArguments:@[@"-c", @"/usr/local/bin/boot2docker down"]];
 
     [task setTerminationHandler:^(NSTask *t) {
+        _haveRequestedStateChange = NO;
         _statusItem.image = [NSImage imageNamed:@"docker-alt"];
     }];