ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bugfix for log console. 

Console type should not be changed by user when console is shown.
This commit is contained in:
taotao54321 2012-03-09 21:36:55 +00:00
parent b207c81fea
commit 7613d51ea2
3 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
BizHawk.MultiClient/LogConsole.cs
View File

@ -271,6 +271,7 @@ namespace BizHawk.MultiClient
if (NeedToRelease) if (NeedToRelease)
{ {
ReleaseConsole(); ReleaseConsole();
NeedToRelease = false;
} }
else else
{ {

4
BizHawk.MultiClient/MainForm.MenuItems.cs
View File

@ -972,9 +972,9 @@ namespace BizHawk.MultiClient
Global.Config.ShowLogWindow ^= true; Global.Config.ShowLogWindow ^= true;
displayLogWindowToolStripMenuItem.Checked = Global.Config.ShowLogWindow; displayLogWindowToolStripMenuItem.Checked = Global.Config.ShowLogWindow;
if (Global.Config.ShowLogWindow) if (Global.Config.ShowLogWindow)
LogConsole.ShowConsole(); ShowConsole();
else else
LogConsole.HideConsole(); HideConsole();
} }
private void PauseStrip_Click(object sender, EventArgs e) private void PauseStrip_Click(object sender, EventArgs e)

16
BizHawk.MultiClient/MainForm.cs
View File

@ -75,7 +75,7 @@ namespace BizHawk.MultiClient
Global.Game = GameInfo.GetNullGame(); Global.Game = GameInfo.GetNullGame();
if (Global.Config.ShowLogWindow) if (Global.Config.ShowLogWindow)
{ {
LogConsole.ShowConsole(); ShowConsole();
//PsxApi.StdioFixes(); //PsxApi.StdioFixes();
displayLogWindowToolStripMenuItem.Checked = true; displayLogWindowToolStripMenuItem.Checked = true;
} }
@ -2728,9 +2728,23 @@ namespace BizHawk.MultiClient
{ {
Global.Config.SkipLagFrame ^= true; Global.Config.SkipLagFrame ^= true;
} }
private void ShowConsole()
{
LogConsole.ShowConsole();
logWindowAsConsoleToolStripMenuItem.Enabled = false;
}
private void HideConsole()
{
LogConsole.HideConsole();
logWindowAsConsoleToolStripMenuItem.Enabled = true;
}
public void notifyLogWindowClosing() public void notifyLogWindowClosing()
{ {
displayLogWindowToolStripMenuItem.Checked = false; displayLogWindowToolStripMenuItem.Checked = false;
logWindowAsConsoleToolStripMenuItem.Enabled = true;
} }
} }
} }