From 8f3a6245f014f4983e48a5be46732808c9d525e2 Mon Sep 17 00:00:00 2001
From: Jenn Magder <magder@google.com>
Date: Tue, 9 Feb 2021 16:06:35 -0800
Subject: [PATCH] Consolidate ascii spinner stop in devtools activation
 (#75679)

---
 packages/flutter_tools/lib/src/devtools_launcher.dart | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/flutter_tools/lib/src/devtools_launcher.dart b/packages/flutter_tools/lib/src/devtools_launcher.dart
index 791f57726d2..e2a4ea03f59 100644
--- a/packages/flutter_tools/lib/src/devtools_launcher.dart
+++ b/packages/flutter_tools/lib/src/devtools_launcher.dart
@@ -153,18 +153,17 @@ class DevtoolsServerLauncher extends DevtoolsLauncher {
         'devtools'
       ]);
       if (_devToolsActivateProcess.exitCode != 0) {
-        status.cancel();
         _logger.printError('Error running `pub global activate '
             'devtools`:\n${_devToolsActivateProcess.stderr}');
         return false;
       }
-      status.stop();
       _persistentToolState.lastDevToolsActivationTime = DateTime.now();
       return true;
     } on Exception catch (e, _) {
-      status.stop();
       _logger.printError('Error running `pub global activate devtools`: $e');
       return false;
+    } finally {
+      status.stop();
     }
   }