Skip to content

Commit

Permalink
Avoid calling cancel on AnsiSpinner more than once when building …
Browse files Browse the repository at this point in the history
…for iOS (flutter#26826)

* Avoid calling cancel more than once

* add some missing checks for ansispinner
  • Loading branch information
dnfield committed Jan 22, 2019
1 parent 386f346 commit 543f892
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion packages/flutter_tools/lib/src/ios/mac.dart
Original file line number Diff line number Diff line change
Expand Up @@ -467,7 +467,8 @@ Future<XcodeBuildResult> buildXcodeProject({
return;
}
} else {
initialBuildStatus.cancel();
initialBuildStatus?.cancel();
initialBuildStatus = null;
buildSubStatus = logger.startProgress(
line,
timeout: kSlowOperation,
Expand All @@ -494,7 +495,9 @@ Future<XcodeBuildResult> buildXcodeProject({
// Notifies listener that no more output is coming.
scriptOutputPipeFile?.writeAsStringSync('all done');
buildSubStatus?.stop();
buildSubStatus = null;
initialBuildStatus?.cancel();
initialBuildStatus = null;
buildStopwatch.stop();
printStatus(
'Xcode build done.'.padRight(kDefaultStatusPadding + 1)
Expand Down

0 comments on commit 543f892

Please sign in to comment.