DockWidget: bug fixes

billziss-gh · Nov 18, 2019 · 040b75f · 040b75f
1 parent b11cbdb
commit 040b75f
Showing 1 changed file with 14 additions and 4 deletions.
diff --git a/src/Widgets/DockWidget.m b/src/Widgets/DockWidget.m
@@ -172,7  172,7 @@ - (void)setProminent:(BOOL)value
 
 - (void)bounce
 {
-    if (!_appLaunching)
     if (!_appLaunching || nil == self.superview)
         return;
 
     [NSAnimationContext runAnimationGroup:^(NSAnimationContext *context)
@@ -1137,15  1137,25 @@ - (void)launchApp:(NSString *)path pid:(pid_t)pid
     BOOL activated = FALSE;
     if (0 != pid)
     {
         NSRunningApplication *runningApp = [NSRunningApplication
             runningApplicationWithProcessIdentifier:pid];
         int count = 0;
         for (DockWidgetApplication *app in self.apps)
             if (nil != app.path && [path isEqualToString:app.path])
                 count  ;
         if (1 < count)
-        {
-            NSRunningApplication *runningApp = [NSRunningApplication
-                runningApplicationWithProcessIdentifier:pid];
             activated = [runningApp activateWithOptions:NSApplicationActivateIgnoringOtherApps];
         else
         {
             NSNumber *value;
             BOOL isApp =
                 [runningApp.bundleURL getResourceValue:&value forKey:NSURLIsApplicationKey error:0] &&
                 [value boolValue];
             if (!isApp)
                 activated = [[NSWorkspace sharedWorkspace] launchAppWithBundleIdentifier:runningApp.bundleIdentifier
                     options:NSWorkspaceLaunchDefault
                     additionalEventParamDescriptor:nil
                     launchIdentifier:0];
         }
     }
     if (!activated && nil != path)