fixed log from writing temp files

Author: Andrew

GitItGUI.Core/ChangesManager.cs

@@ -437,8 +437,10 @@ public static bool ResolveConflict(FileState fileState, bool refresh)
 				}
 
 				// save local temp files
+				Debug.pauseGitCommanderStdWrites = true;
 				if (!Repository.SaveConflictedFile(fileState.filename, FileConflictSources.Ours, out fullPathOurs)) throw new Exception(Repository.lastError);
 				if (!Repository.SaveConflictedFile(fileState.filename, FileConflictSources.Theirs, out fullPathTheirs)) throw new Exception(Repository.lastError);
+				Debug.pauseGitCommanderStdWrites = false;
 				fullPathOurs = Repository.repoPath + Path.DirectorySeparatorChar + fullPathOurs;
 				fullPathTheirs = Repository.repoPath + Path.DirectorySeparatorChar + fullPathTheirs;
 
@@ -598,6 +600,7 @@ public static bool ResolveConflict(FileState fileState, bool refresh)
 			}
 			catch (Exception e)
 			{
+				Debug.pauseGitCommanderStdWrites = false;
 				Debug.LogError("Failed to resolve file: " + e.Message, true);
 				DeleteTempMergeFiles();
 				return false;
@@ -629,7 +632,9 @@ public static bool OpenDiffTool(FileState fileState)
 				}
 
 				// get info and save orig file
+				Debug.pauseGitCommanderStdWrites = true;
 				if (!Repository.SaveOriginalFile(fileState.filename, out fullPathOrig)) throw new Exception(Repository.lastError);
+				Debug.pauseGitCommanderStdWrites = false;
 				fullPathOrig = Repository.repoPath + Path.DirectorySeparatorChar + fullPathOrig;
 
 				// open diff tool
@@ -650,6 +655,7 @@ public static bool OpenDiffTool(FileState fileState)
 			}
 			catch (Exception ex)
 			{
+				Debug.pauseGitCommanderStdWrites = false;
 				Debug.LogError("Failed to start Diff tool: " + ex.Message, true);
 				DeleteTempDiffFiles();
 				return false;

GitItGUI.Core/Tools/Debug.cs

@@ -20,6 +20,7 @@ public static class Debug
 
 		private static Stream stream;
 		private static StreamWriter writer;
+		public static bool pauseGitCommanderStdWrites;
 
 		static Debug()
 		{
@@ -49,7 +50,7 @@ private static void Tools_RunExeDebugLineCallback(string line)
 
 		private static void Tools_StdCallback(string line)
 		{
-			Log(line);
+			if (!pauseGitCommanderStdWrites) Log(line);
 		}
 
 		private static void Tools_StdWarningCallback(string line)