Unverified Commit 543f8924 authored by Dan Field's avatar Dan Field Committed by GitHub

Avoid calling `cancel` on `AnsiSpinner` more than once when building for iOS (#26826)

* Avoid calling cancel more than once

* add some missing checks for ansispinner
parent 386f3466
...@@ -467,7 +467,8 @@ Future<XcodeBuildResult> buildXcodeProject({ ...@@ -467,7 +467,8 @@ Future<XcodeBuildResult> buildXcodeProject({
return; return;
} }
} else { } else {
initialBuildStatus.cancel(); initialBuildStatus?.cancel();
initialBuildStatus = null;
buildSubStatus = logger.startProgress( buildSubStatus = logger.startProgress(
line, line,
timeout: kSlowOperation, timeout: kSlowOperation,
...@@ -494,7 +495,9 @@ Future<XcodeBuildResult> buildXcodeProject({ ...@@ -494,7 +495,9 @@ Future<XcodeBuildResult> buildXcodeProject({
// Notifies listener that no more output is coming. // Notifies listener that no more output is coming.
scriptOutputPipeFile?.writeAsStringSync('all done'); scriptOutputPipeFile?.writeAsStringSync('all done');
buildSubStatus?.stop(); buildSubStatus?.stop();
buildSubStatus = null;
initialBuildStatus?.cancel(); initialBuildStatus?.cancel();
initialBuildStatus = null;
buildStopwatch.stop(); buildStopwatch.stop();
printStatus( printStatus(
'Xcode build done.'.padRight(kDefaultStatusPadding + 1) 'Xcode build done.'.padRight(kDefaultStatusPadding + 1)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment