summaryrefslogtreecommitdiffstats
path: root/win/C#/frmActivityWindow.cs
diff options
context:
space:
mode:
authorsr55 <[email protected]>2009-09-30 14:39:12 +0000
committersr55 <[email protected]>2009-09-30 14:39:12 +0000
commit6a2e47339a1dd65c4866c1d907f6b74565953e02 (patch)
tree594ec3a1de7da1255432844de2d7540453f5b033 /win/C#/frmActivityWindow.cs
parent7a88c8b6b3a1ba9f5ca08d1c9b235b0dfd2d1d1d (diff)
WinGui:
- Add a notice to the log to indicate if the user has used a custom query. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2854 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'win/C#/frmActivityWindow.cs')
-rw-r--r--win/C#/frmActivityWindow.cs14
1 files changed, 8 insertions, 6 deletions
diff --git a/win/C#/frmActivityWindow.cs b/win/C#/frmActivityWindow.cs
index 9509500a6..9f9f41128 100644
--- a/win/C#/frmActivityWindow.cs
+++ b/win/C#/frmActivityWindow.cs
@@ -74,11 +74,6 @@ namespace Handbrake
rtf_actLog.AppendText(String.Format("### Install Dir: {0} \n", Application.StartupPath));
rtf_actLog.AppendText(String.Format("### Data Dir: {0} \n", Application.UserAppDataPath));
rtf_actLog.AppendText("#########################################\n\n");
- if ((!_encodeQueue.LastEncode.IsEmpty) && _encodeQueue.LastEncode.Query != String.Empty)
- {
- rtf_actLog.AppendText("### CLI Query: " + _encodeQueue.LastEncode.Query + "\n\n");
- rtf_actLog.AppendText("#########################################\n\n");
- }
// Seutp the log file
if (scan)
@@ -90,6 +85,13 @@ namespace Handbrake
{
_readFile = "last_encode_log.txt";
txt_log.Text = "Encode Log";
+ if (_encodeQueue.isEncoding)
+ if ((!_encodeQueue.LastEncode.IsEmpty) && _encodeQueue.LastEncode.Query != String.Empty)
+ {
+ rtf_actLog.AppendText("### CLI Query: " + _encodeQueue.LastEncode.Query + "\n");
+ rtf_actLog.AppendText("### Custom Query: " + _encodeQueue.LastEncode.CustomQuery + "\n\n");
+ rtf_actLog.AppendText("#########################################\n\n");
+ }
}
_lastUpdate = false;
}
@@ -184,7 +186,7 @@ namespace Handbrake
fileNotFoundQuickFix = true;
return "\n\n\nERROR: The log file could not be found. \nMaybe you cleared your system's tempory folder or maybe you just havn't run an encode yet. \nTried to find the log file in: " + logFile;
}
-
+
StreamReader sr = new StreamReader(logFile2);
string line;
int i = 1;