Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix to #43625: spin sync icon on push #52146

Merged
merged 2 commits into from Jun 18, 2018
Merged

Fix to #43625: spin sync icon on push #52146

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
080e824
Fix #51677: Git icon not spinning when pushing from command palette
NahomAgidew Jun 18, 2018
4b1df4f
Update statusbar.ts
joaomoreno Jun 18, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 6 additions & 5 deletions extensions/git/src/statusbar.ts
View file
Open in desktop
Expand Up @@ -71,10 +71,11 @@ class SyncStatusBar {
}

private onOperationsChange(): void {
this.state = {
...this.state,
isSyncRunning: this.repository.operations.isRunning(Operation.Sync)
};
const isSyncRunning = this.repository.operations.isRunning(Operation.Sync) ||
this.repository.operations.isRunning(Operation.Push) ||
this.repository.operations.isRunning(Operation.Pull);

this.state = { ...this.state, isSyncRunning };
}

private onModelChange(): void {
Expand Down Expand Up @@ -173,4 +174,4 @@ export class StatusBarCommands {
this.checkoutStatusBar.dispose();
this.disposables = dispose(this.disposables);
}
}
}