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

Commit 187662d

Browse files
authored
Merge branch '1.0rc/master' into 1.0rc/fixes/dispose-of-things
2 parents c39873d + 9ea8923 commit 187662d

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

src/GitHub.Api/Application/ApplicationManagerBase.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public void Run(bool firstRun)
5656
Logger.Trace("Run - CurrentDirectory {0}", NPath.CurrentDirectory);
5757

5858
var gitExecutablePath = SystemSettings.Get(Constants.GitInstallPathKey)?.ToNPath();
59-
if (gitExecutablePath != null && gitExecutablePath.Value.FileExists()) // we have a git path
59+
if (gitExecutablePath.HasValue && gitExecutablePath.Value.FileExists()) // we have a git path
6060
{
6161
Logger.Trace("Using git install path from settings: {0}", gitExecutablePath);
6262
InitializeEnvironment(gitExecutablePath.Value);
@@ -71,7 +71,7 @@ public void Run(bool firstRun)
7171
var findExecTask = new FindExecTask("git", CancellationToken)
7272
.FinallyInUI((b, ex, path) =>
7373
{
74-
if (b && path != null)
74+
if (b && path.IsInitialized)
7575
{
7676
//Logger.Trace("FindExecTask Success: {0}", path);
7777
InitializeEnvironment(path);
@@ -144,7 +144,7 @@ public ITask InitializeRepository()
144144

145145
public void RestartRepository()
146146
{
147-
if (Environment.RepositoryPath != null)
147+
if (Environment.RepositoryPath.IsInitialized)
148148
{
149149
repositoryManager = Unity.RepositoryManager.CreateInstance(Platform, TaskManager, GitClient, Environment.FileSystem, Environment.RepositoryPath);
150150
repositoryManager.Initialize();

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class GitPathView : Subview
3535
public override void InitializeView(IView parent)
3636
{
3737
base.InitializeView(parent);
38-
gitExecutableIsSet = Environment.GitExecutablePath != null;
38+
gitExecutableIsSet = Environment.GitExecutablePath.IsInitialized;
3939
}
4040

4141
public override void OnEnable()
@@ -181,7 +181,7 @@ private void MaybeUpdateData()
181181
}
182182
}
183183

184-
if (Environment.GitExecutablePath != null)
184+
if (Environment.GitExecutablePath.IsInitialized)
185185
{
186186
newGitExec = gitExec = Environment.GitExecutablePath.ToString();
187187
gitExecParent = Environment.GitExecutablePath.Parent.ToString();

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class InitProjectView : Subview
2222
public override void InitializeView(IView parent)
2323
{
2424
base.InitializeView(parent);
25-
gitExecutableIsSet = Environment.GitExecutablePath != null;
25+
gitExecutableIsSet = Environment.GitExecutablePath.IsInitialized;
2626
Redraw();
2727
}
2828

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class UserSettingsView : Subview
2626
public override void InitializeView(IView parent)
2727
{
2828
base.InitializeView(parent);
29-
gitExecutableIsSet = Environment.GitExecutablePath != null;
29+
gitExecutableIsSet = Environment.GitExecutablePath.IsInitialized;
3030
}
3131

3232
public override void OnDataUpdate()

0 commit comments

Comments
 (0)