Merge branch 'master' of ssh://github.com/TASVideos/bizhawk

This commit is contained in:
nattthebear 2016-02-28 15:06:34 -05:00
commit ad2a830195
1 changed files with 7 additions and 1 deletions

View File

@ -324,7 +324,7 @@ namespace BizHawk.Client.EmuHawk
FileBox.Visible = true; FileBox.Visible = true;
BrowseBox.Visible = true; BrowseBox.Visible = true;
var name = PathManager.FilesystemSafeName(Global.Game); var name = PathManager.FilesystemSafeName(Global.Game);
var filename = Path.Combine(PathManager.MakeAbsolutePath(Global.Config.PathEntries.LogPathFragment, null), name) + ".txt"; var filename = Path.Combine(PathManager.MakeAbsolutePath(Global.Config.PathEntries.LogPathFragment, null), name) + ".log";
_logFile = new FileInfo(filename); _logFile = new FileInfo(filename);
if (_logFile.Directory != null && !_logFile.Directory.Exists) if (_logFile.Directory != null && !_logFile.Directory.Exists)
{ {
@ -339,6 +339,12 @@ namespace BizHawk.Client.EmuHawk
using (_logFile.Create()) { } using (_logFile.Create()) { }
FileBox.Text = _logFile.FullName; FileBox.Text = _logFile.FullName;
if (LoggingEnabled.Checked && _logFile != null)
{
StartLogFile(_logFile);
OpenLogFile.Enabled = true;
}
} }
else else
{ {