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

Commit 3ef6ecc

Browse files
Diabling parent SettingsView correctly
1 parent c3e9a79 commit 3ef6ecc

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ private void OnRepositorySettingsGUI()
242242
{
243243
GUILayout.Label(GitRepositoryTitle, EditorStyles.boldLabel);
244244

245-
EditorGUI.BeginDisabledGroup(isBusy);
245+
EditorGUI.BeginDisabledGroup(IsBusy);
246246
{
247247
newRepositoryRemoteUrl = EditorGUILayout.TextField(GitRepositoryRemoteLabel + ": " + repositoryRemoteName, newRepositoryRemoteUrl);
248248
var needsSaving = newRepositoryRemoteUrl != repositoryRemoteUrl && !String.IsNullOrEmpty(newRepositoryRemoteUrl);
@@ -519,7 +519,7 @@ private void OnGitIgnoreRulesGUI()
519519

520520
private void OnGitLfsLocksGUI()
521521
{
522-
EditorGUI.BeginDisabledGroup(isBusy || Repository == null);
522+
EditorGUI.BeginDisabledGroup(IsBusy || Repository == null);
523523
{
524524
GUILayout.BeginVertical();
525525
{
@@ -608,7 +608,7 @@ private void OnInstallPathGUI()
608608
// Install path
609609
GUILayout.Label(GitInstallTitle, EditorStyles.boldLabel);
610610

611-
EditorGUI.BeginDisabledGroup(isBusy || gitExecPath == null);
611+
EditorGUI.BeginDisabledGroup(IsBusy || gitExecPath == null);
612612
{
613613
// Install path field
614614
EditorGUI.BeginChangeCheck();
@@ -657,7 +657,7 @@ private void OnPrivacyGui()
657657

658658
GUILayout.Label(PrivacyTitle, EditorStyles.boldLabel);
659659

660-
EditorGUI.BeginDisabledGroup(isBusy || service == null);
660+
EditorGUI.BeginDisabledGroup(IsBusy || service == null);
661661
{
662662
var metricsEnabled = service != null ? service.Enabled : false;
663663
EditorGUI.BeginChangeCheck();
@@ -677,7 +677,7 @@ private void OnLoggingSettingsGui()
677677
{
678678
GUILayout.Label(DebugSettingsTitle, EditorStyles.boldLabel);
679679

680-
EditorGUI.BeginDisabledGroup(isBusy);
680+
EditorGUI.BeginDisabledGroup(IsBusy);
681681
{
682682
var traceLogging = Logging.TracingEnabled;
683683

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public override void OnGUI()
4343
{
4444
GUILayout.Label(GitConfigTitle, EditorStyles.boldLabel);
4545

46-
EditorGUI.BeginDisabledGroup(isBusy);
46+
EditorGUI.BeginDisabledGroup(IsBusy || Parent.IsBusy);
4747
{
4848
newGitName = EditorGUILayout.TextField(GitConfigNameLabel, newGitName);
4949
newGitEmail = EditorGUILayout.TextField(GitConfigEmailLabel, newGitEmail);

0 commit comments

Comments
 (0)