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

Commit dfd07a3

Browse files
committed
Fix path to extension installation and other small issues
1 parent abeacbe commit dfd07a3

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

src/GitHub.Api/Application/ApplicationManagerBase.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,11 +201,11 @@ protected void SetupMetrics(string unityVersion, bool firstRun)
201201
/// <param name="octorunScriptPath"></param>
202202
private void InitializeEnvironment(NPath gitExecutablePath)
203203
{
204+
isBusy = false;
204205
SetupMetrics();
205206

206207
if (!gitExecutablePath.IsInitialized)
207208
{
208-
isBusy = false;
209209
return;
210210
}
211211

src/UnityExtension/Assets/Editor/GitHub.Unity/ApplicationCache.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ private NPath DetermineInstallationPath()
8787
// Juggling to find out where we got installed
8888
var shim = CreateInstance<RunLocationShim>();
8989
var script = MonoScript.FromScriptableObject(shim);
90-
var scriptPath = AssetDatabase.GetAssetPath(script).ToNPath();
90+
var scriptPath = Application.dataPath.ToNPath().Parent.Combine(AssetDatabase.GetAssetPath(script).ToNPath());
9191
DestroyImmediate(shim);
9292
return scriptPath.Parent;
9393
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public virtual void Finish(bool result)
6161
public bool HasFocus { get { return Parent != null && Parent.HasFocus; } }
6262
public virtual bool IsBusy
6363
{
64-
get { return Manager.IsBusy || Repository != null ? Repository.IsBusy : false; }
64+
get { return (Manager != null && Manager.IsBusy) || (Repository != null && Repository.IsBusy); }
6565
}
6666

6767
protected ITaskManager TaskManager { get { return Manager.TaskManager; } }

0 commit comments

Comments
 (0)