Fix crash when blaming a file not in a repo.

bgrainger · Apr 10, 2015 · 8d95326 · 8d95326
1 parent 722b303
commit 8d95326
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/GitBlame.nuspec b/GitBlame.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
     <metadata>
         <id>GitBlame</id>
-        <version>0.4.0</version>
+        <version>0.4.2</version>
         <title>GitBlame GUI for Windows</title>
         <authors>Bradley Grainger</authors>
         <licenseUrl>https://github.com/bgrainger/GitBlame/blob/master/COPYING</licenseUrl>

diff --git a/src/GitBlame/BlameControl.cs b/src/GitBlame/BlameControl.cs
@@ -246,7 +246,7 @@ private string GetCommitIdFromPoint(Point point)
 
 		protected override void OnScrollChanged()
 		{
-			m_layout = m_layout.WithTopLineNumber((int) VerticalOffset + 1);
+			m_layout = m_layout == null ? null : m_layout.WithTopLineNumber((int) VerticalOffset + 1);
 			if (RenderSize.Width > 0 && RenderSize.Height > 0)
 				Render();
 		}

diff --git a/src/GitBlame/Models/GitWrapper.cs b/src/GitBlame/Models/GitWrapper.cs
@@ -415,6 +415,7 @@ public static bool SplitRepositoryPath(string filePath, out string gitDirectory,
 			while (currentDirectory != null);
 
 			Log.WarnFormat("Can't find .git directory for {0}", filePath);
+			gitDirectory = null;
 			fileName = null;
 			return false;
 		}

diff --git a/src/GitBlame/Properties/AssemblyInfo.cs b/src/GitBlame/Properties/AssemblyInfo.cs
@@ -10,6 +10,6 @@
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
-[assembly: AssemblyVersion("0.4.1")]
-[assembly: AssemblyFileVersion("0.4.1")]
-[assembly: AssemblyInformationalVersion("0.4.1")]
+[assembly: AssemblyVersion("0.4.2")]
+[assembly: AssemblyFileVersion("0.4.2")]
+[assembly: AssemblyInformationalVersion("0.4.2")]