Merge branch 'fixes/locks-might-be-null' into fixes/batching-repository-watcher

StanleyGoldman · StanleyGoldman · commit 6d6877044d23 · 2017-09-15T17:16:38.000-04:00
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/SettingsView.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/SettingsView.cs
@@ -240,7 +240,10 @@ private void MaybeUpdateData()
             if (locksHaveChanged)
             {
                 locksHaveChanged = false;
-                lockedFiles = Repository.CurrentLocks.ToList();
+                var repositoryCurrentLocks = Repository.CurrentLocks;
+                lockedFiles = repositoryCurrentLocks != null
+                    ? repositoryCurrentLocks.ToList()
+                    : new List<GitLock>();
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -240,7 +240,10 @@ private void MaybeUpdateData()`
`240`	`240`	`if (locksHaveChanged)`
`241`	`241`	`{`
`242`	`242`	`locksHaveChanged = false;`
`243`		`- lockedFiles = Repository.CurrentLocks.ToList();`
	`243`	`+ var repositoryCurrentLocks = Repository.CurrentLocks;`
	`244`	`+ lockedFiles = repositoryCurrentLocks != null`
	`245`	`+ ? repositoryCurrentLocks.ToList()`
	`246`	`+ : new List<GitLock>();`
`244`	`247`	`}`
`245`	`248`	`}`
`246`	`249`