Only access globals.deviceManager if actually setting something (#111461)

836c16ef · jensjoha · GitHub · b84bfa35 · 836c16ef
Unverified Commit 836c16ef authored Sep 19, 2022 by jensjoha Committed by GitHub Sep 19, 2022
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

flutter_command_runner.dart .../flutter_tools/lib/src/runner/flutter_command_runner.dart +4 -1

No files found.
--- a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
+++ b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
@@ -256,7 +256,10 @@ class FlutterCommandRunner extends CommandRunner<void> {
        }

        // See if the user specified a specific device.
-        globals.deviceManager?.specifiedDeviceId = topLevelResults['device-id'] as String?;
+        final String? specifiedDeviceId = topLevelResults['device-id'] as String?;
+        if (specifiedDeviceId != null) {
+          globals.deviceManager?.specifiedDeviceId = specifiedDeviceId;
+        }

        if ((topLevelResults['version'] as bool?) ?? false) {
          globals.flutterUsage.sendCommand('version');