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

Fix crash on saving config if ram watch is closed. Refactor some config saving stuff

This commit is contained in:
andres.delikat 2011-02-25 02:45:22 +00:00
parent 94ed90cc9d
commit 04bee5f950
3 changed files with 28 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
BizHawk.MultiClient/MainForm.cs
View File

@ -75,19 +75,8 @@ namespace BizHawk.MultiClient
Closing += (o, e) => Closing += (o, e) =>
{ {
CloseGame(); CloseGame();
if (Global.Config.SaveWindowPosition) SaveConfig();
{
Global.Config.MainWndx = this.Location.X;
Global.Config.MainWndy = this.Location.Y;
}
else
{
Global.Config.MainWndx = -1;
Global.Config.MainWndy = -1;
}
RamWatch1.SaveConfigSettings();
ConfigService.Save("config.ini", Global.Config);
}; };
ResizeBegin += (o, e) => ResizeBegin += (o, e) =>
@ -1068,7 +1057,7 @@ namespace BizHawk.MultiClient
private void saveConfigToolStripMenuItem_Click(object sender, EventArgs e) private void saveConfigToolStripMenuItem_Click(object sender, EventArgs e)
{ {
ConfigService.Save("config.ini", Global.Config); SaveConfig();
Global.RenderPanel.AddMessage("Saved settings"); Global.RenderPanel.AddMessage("Saved settings");
} }
@ -1078,6 +1067,21 @@ namespace BizHawk.MultiClient
Global.RenderPanel.AddMessage("Saved loaded"); Global.RenderPanel.AddMessage("Saved loaded");
} }
private void SaveConfig()
{
if (Global.Config.SaveWindowPosition)
{
Global.Config.MainWndx = this.Location.X;
Global.Config.MainWndy = this.Location.Y;
}
else
{
Global.Config.MainWndx = -1;
Global.Config.MainWndy = -1;
}
if (!RamWatch1.IsDisposed)
RamWatch1.SaveConfigSettings();
ConfigService.Save("config.ini", Global.Config);
}
} }
} }

2
BizHawk.MultiClient/tools/RamWatch.Designer.cs generated
View File

@ -671,8 +671,6 @@
this.Load += new System.EventHandler(this.RamWatch_Load); this.Load += new System.EventHandler(this.RamWatch_Load);
this.DragDrop += new System.Windows.Forms.DragEventHandler(this.RamWatch_DragDrop); this.DragDrop += new System.Windows.Forms.DragEventHandler(this.RamWatch_DragDrop);
this.DragEnter += new System.Windows.Forms.DragEventHandler(this.RamWatch_DragEnter); this.DragEnter += new System.Windows.Forms.DragEventHandler(this.RamWatch_DragEnter);
this.Resize += new System.EventHandler(this.RamWatch_Resize);
this.LocationChanged += new System.EventHandler(this.RamWatch_LocationChanged);
this.menuStrip1.ResumeLayout(false); this.menuStrip1.ResumeLayout(false);
this.menuStrip1.PerformLayout(); this.menuStrip1.PerformLayout();
this.contextMenuStrip1.ResumeLayout(false); this.contextMenuStrip1.ResumeLayout(false);

27
BizHawk.MultiClient/tools/RamWatch.cs
View File

@ -91,7 +91,10 @@ namespace BizHawk.MultiClient
Global.Config.RamWatchChangeWidth = WatchListView.Columns[3].Width; Global.Config.RamWatchChangeWidth = WatchListView.Columns[3].Width;
Global.Config.RamWatchNotesWidth = WatchListView.Columns[4].Width; Global.Config.RamWatchNotesWidth = WatchListView.Columns[4].Width;
Global.Config.RamWatchWndx = this.Location.X;
Global.Config.RamWatchWndy = this.Location.Y;
Global.Config.RamWatchWidth = this.Right - this.Left;
Global.Config.RamWatchHeight = this.Bottom - this.Top;
} }
public RamWatch() public RamWatch()
@ -726,32 +729,20 @@ namespace BizHawk.MultiClient
} }
} }
private void RamWatch_LocationChanged(object sender, EventArgs e)
{
Global.Config.RamWatchWndx = this.Location.X;
Global.Config.RamWatchWndy = this.Location.Y;
}
private void RamWatch_Resize(object sender, EventArgs e)
{
Global.Config.RamWatchWidth = this.Right - this.Left;
Global.Config.RamWatchHeight = this.Bottom - this.Top;
}
private void restoreWindowSizeToolStripMenuItem_Click(object sender, EventArgs e) private void restoreWindowSizeToolStripMenuItem_Click(object sender, EventArgs e)
{ {
this.Size = new System.Drawing.Size(defaultWidth, defaultHeight); this.Size = new System.Drawing.Size(defaultWidth, defaultHeight);
WatchListView.Columns[0].Width = Global.Config.RamWatchAddressWidth; WatchListView.Columns[0].Width = 59; //Address
WatchListView.Columns[1].Width = Global.Config.RamWatchValueWidth; WatchListView.Columns[1].Width = 59; //Value
if (showPreviousValueToolStripMenuItem.Checked) if (showPreviousValueToolStripMenuItem.Checked)
WatchListView.Columns[2].Width = Global.Config.RamWatchPrevWidth; WatchListView.Columns[2].Width = 59; //Prev
else else
WatchListView.Columns[2].Width = 0; WatchListView.Columns[2].Width = 0;
if (showChangeCountsToolStripMenuItem.Checked) if (showChangeCountsToolStripMenuItem.Checked)
WatchListView.Columns[3].Width = Global.Config.RamWatchChangeWidth; WatchListView.Columns[3].Width = 54; //Change counts
else else
WatchListView.Columns[3].Width = 0; WatchListView.Columns[3].Width = 0;
WatchListView.Columns[4].Width = Global.Config.RamWatchNotesWidth; WatchListView.Columns[4].Width = 130; //Notes
} }
private void newToolStripButton_Click(object sender, EventArgs e) private void newToolStripButton_Click(object sender, EventArgs e)