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

GB settings - diable Property Grid if a movie is active

This commit is contained in:
adelikat 2014-08-06 00:40:20 +00:00
parent 572ad8f6ab
commit 3d14177877
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
BizHawk.Client.EmuHawk/config/GB/GBPrefControl.cs
View File

@ -6,7 +6,9 @@ using System.Data;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Windows.Forms; using System.Windows.Forms;
using BizHawk.Emulation.Cores.Nintendo.Gameboy; using BizHawk.Emulation.Cores.Nintendo.Gameboy;
using BizHawk.Client.Common;
namespace BizHawk.Client.EmuHawk.config.GB namespace BizHawk.Client.EmuHawk.config.GB
{ {
@ -28,6 +30,7 @@ namespace BizHawk.Client.EmuHawk.config.GB
this.s = s ?? new Gameboy.GambatteSettings(); this.s = s ?? new Gameboy.GambatteSettings();
this.ss = ss ?? new Gameboy.GambatteSyncSettings(); this.ss = ss ?? new Gameboy.GambatteSyncSettings();
propertyGrid1.SelectedObject = this.ss; propertyGrid1.SelectedObject = this.ss;
propertyGrid1.Enabled = !Global.MovieSession.Movie.IsActive;
} }
public void GetSettings(out Gameboy.GambatteSettings s, out Gameboy.GambatteSyncSettings ss) public void GetSettings(out Gameboy.GambatteSettings s, out Gameboy.GambatteSyncSettings ss)
@ -38,7 +41,7 @@ namespace BizHawk.Client.EmuHawk.config.GB
private void buttonDefaults_Click(object sender, EventArgs e) private void buttonDefaults_Click(object sender, EventArgs e)
{ {
PutSettings(null, null); PutSettings(null, Global.MovieSession.Movie.IsActive ? ss : null);
} }
private void buttonPalette_Click(object sender, EventArgs e) private void buttonPalette_Click(object sender, EventArgs e)