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

Commit 4d1494b

Browse files
Merge branch 'master' into fixes/update-lfs-mac
2 parents ab0b782 + b0f0b33 commit 4d1494b

File tree

3 files changed

+3
-4
lines changed

3 files changed

+3
-4
lines changed

src/GitHub.Api/Primitives/Package.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public static Package Load(IEnvironment environment, UriString packageFeed)
4444
if (!feed.IsInitialized)
4545
{
4646
// try from assembly resources
47-
feed = AssemblyResources.ToFile(ResourceType.Platform, packageFeed.Filename, environment.UserCachePath.Combine(packageFeed.Filename), environment);
47+
feed = AssemblyResources.ToFile(ResourceType.Platform, packageFeed.Filename, environment.UserCachePath, environment);
4848
}
4949

5050
if (feed.IsInitialized)

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,6 @@ public override void OnSelectionChange()
119119

120120
public override void OnFocusChanged()
121121
{
122-
Logger.Debug("OnFocusChanged: {0}", HasFocus);
123-
124122
base.OnFocusChanged();
125123
var hasFocus = HasFocus;
126124
if (treeChanges.ViewHasFocus != hasFocus)

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,8 @@ public class UpdateCheckWindow : EditorWindow
6060

6161
public static void CheckForUpdates()
6262
{
63-
var download = new DownloadTask(TaskManager.Instance.Token, EntryPoint.Environment.FileSystem, UpdateFeedUrl, EntryPoint.Environment.UserCachePath);
63+
var download = new DownloadTask(TaskManager.Instance.Token, EntryPoint.Environment.FileSystem, UpdateFeedUrl, EntryPoint.Environment.UserCachePath)
64+
.Catch(e => true);
6465
download.OnEnd += (thisTask, result, success, exception) =>
6566
{
6667
if (success)

0 commit comments

Comments
 (0)