Merge pull request #322 from github-for-unity/fixes/locks-might-be-null

shana · web-flow · commit 81d8787b632c · 2017-09-18T14:19:27.000+02:00
Checking if CurrentLocks is null to update SettingsView
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/SettingsView.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/SettingsView.cs
@@ -236,7 +236,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
`@@ -236,7 +236,10 @@ private void MaybeUpdateData()`
`236`	`236`	`if (locksHaveChanged)`
`237`	`237`	`{`
`238`	`238`	`locksHaveChanged = false;`
`239`		`- lockedFiles = Repository.CurrentLocks.ToList();`
	`239`	`+ var repositoryCurrentLocks = Repository.CurrentLocks;`
	`240`	`+ lockedFiles = repositoryCurrentLocks != null`
	`241`	`+ ? repositoryCurrentLocks.ToList()`
	`242`	`+ : new List<GitLock>();`
`240`	`243`	`}`
`241`	`244`	`}`
`242`	`245`