This repository was archived by the owner on Dec 5, 2024. It is now read-only.
File tree Expand file tree Collapse file tree 2 files changed +10
-8
lines changed
UnityExtension/Assets/Editor/GitHub.Unity/UI Expand file tree Collapse file tree 2 files changed +10
-8
lines changed Original file line number Diff line number Diff line change @@ -8,7 +8,7 @@ static class Constants
8
8
public const string GitInstallPathKey = "GitInstallPath" ;
9
9
public const string TraceLoggingKey = "EnableTraceLogging" ;
10
10
11
- public static readonly SoftwareVersion MinimumGitVersion = new SoftwareVersion ( 2 , 1 , 0 ) ;
12
- public static readonly SoftwareVersion MinimumGitLfsVersion = new SoftwareVersion ( 2 , 1 , 0 ) ;
11
+ public static readonly SoftwareVersion MinimumGitVersion = new SoftwareVersion ( 2 , 12 , 2 ) ;
12
+ public static readonly SoftwareVersion MinimumGitLfsVersion = new SoftwareVersion ( 2 , 0 , 2 ) ;
13
13
}
14
14
}
Original file line number Diff line number Diff line change @@ -91,8 +91,6 @@ public override void OnGUI()
91
91
{
92
92
if ( GUILayout . Button ( GitPathSaveButton , GUILayout . ExpandWidth ( false ) ) )
93
93
{
94
- Logger . Trace ( "Saving Git Path:{0}" , newGitExec ) ;
95
-
96
94
GUI . FocusControl ( null ) ;
97
95
98
96
ValidateAndSetGitInstallPath ( newGitExec ) ;
@@ -130,8 +128,6 @@ public override void OnGUI()
130
128
{
131
129
ValidateAndSetGitInstallPath ( path ) ;
132
130
}
133
-
134
- isBusy = false ;
135
131
} ) . Start ( ) ;
136
132
}
137
133
}
@@ -142,24 +138,30 @@ public override void OnGUI()
142
138
143
139
private void ValidateAndSetGitInstallPath ( string value )
144
140
{
145
- GitClient . ValidateGitInstall ( value ) . Then ( ( sucess , result ) => {
141
+ Logger . Trace ( "Validating Git Path:{0}" , value ) ;
142
+
143
+ GitClient . ValidateGitInstall ( value ) . ThenInUI ( ( sucess , result ) => {
146
144
if ( ! sucess )
147
145
{
148
146
Logger . Trace ( "Error getting software versions" ) ;
147
+ isBusy = false ;
149
148
return ;
150
149
}
151
150
152
151
if ( ! result . IsValid )
153
152
{
154
153
Logger . Warning ( "Software versions do not meet minimums Git:{0} GitLfs:{1}" , result . GitVersionTask , result . GitLfsVersionTask ) ;
154
+ isBusy = false ;
155
155
return ;
156
156
}
157
157
158
158
Manager . SystemSettings . Set ( Constants . GitInstallPathKey , value ) ;
159
159
Environment . GitExecutablePath = value . ToNPath ( ) ;
160
160
161
161
gitExecHasChanged = true ;
162
- } ) ;
162
+ isBusy = false ;
163
+
164
+ } ) . Start ( ) ;
163
165
}
164
166
165
167
private void MaybeUpdateData ( )
You can’t perform that action at this time.
0 commit comments