Skip to content
This repository was archived by the owner on Dec 5, 2024. It is now read-only.

Commit 7f9e91c

Browse files
shanaStanleyGoldman
authored andcommitted
isBusy should not be serialized (#790)
Otherwise the UI might get locked out if Unity reloads in the middle of an operation
1 parent 6ae0b3f commit 7f9e91c

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

src/UnityExtension/Assets/Editor/GitHub.Unity/UI/ChangesView.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ class ChangesView : Subview
2323
[SerializeField] private bool currentLocksHasUpdate;
2424

2525
[NonSerialized] private GUIContent discardGuiContent;
26+
[NonSerialized] private bool isBusy;
2627

2728
[SerializeField] private string commitBody = "";
2829
[SerializeField] private string commitMessage = "";
@@ -39,7 +40,6 @@ class ChangesView : Subview
3940
[SerializeField] private CacheUpdateEvent lastCurrentBranchChangedEvent;
4041
[SerializeField] private CacheUpdateEvent lastStatusEntriesChangedEvent;
4142
[SerializeField] private CacheUpdateEvent lastLocksChangedEvent;
42-
[SerializeField] private bool isBusy;
4343

4444
public override void OnEnable()
4545
{

src/UnityExtension/Assets/Editor/GitHub.Unity/UI/LocksView.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -372,6 +372,8 @@ public bool OnSelectionChange()
372372
[Serializable]
373373
class LocksView : Subview
374374
{
375+
[NonSerialized] private bool isBusy;
376+
375377
[SerializeField] private bool currentStatusEntriesHasUpdate;
376378
[SerializeField] private bool currentLocksHasUpdate;
377379
[SerializeField] private bool currentUserHasUpdate;
@@ -382,7 +384,6 @@ class LocksView : Subview
382384
[SerializeField] private List<GitLock> lockedFiles = new List<GitLock>();
383385
[SerializeField] private List<GitStatusEntry> gitStatusEntries = new List<GitStatusEntry>();
384386
[SerializeField] private string currentUsername;
385-
[SerializeField] private bool isBusy;
386387
[SerializeField] private GUIContent unlockFileMenuContent = new GUIContent(Localization.UnlockFileMenuItem);
387388
[SerializeField] private GUIContent forceUnlockFileMenuContent = new GUIContent(Localization.ForceUnlockFileMenuItem);
388389

0 commit comments

Comments
 (0)