diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/PlaybackBox.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/PlaybackBox.cs index d80760063f..4772e146e0 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/PlaybackBox.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/PlaybackBox.cs @@ -62,16 +62,23 @@ namespace BizHawk.Client.EmuHawk } } - public PlaybackBox() + public PlaybackBox(TAStudio tastudio) { + Tastudio = tastudio; InitializeComponent(); + + } + + protected override void OnLoad(EventArgs e) + { + base.OnLoad(e); + _programmaticallyChangingValue = true; - if (Global.Config != null) // A check needed for the designer - { - TurboSeekCheckbox.Checked = Global.Config.TurboSeek; - AutoRestoreCheckbox.Checked = Tastudio.Settings.AutoRestoreLastPosition; - FollowCursorCheckbox.Checked = Tastudio.Settings.FollowCursor; - } + + TurboSeekCheckbox.Checked = Global.Config.TurboSeek; + AutoRestoreCheckbox.Checked = Tastudio.Settings.AutoRestoreLastPosition; + FollowCursorCheckbox.Checked = Tastudio.Settings.FollowCursor; + _programmaticallyChangingValue = false; } diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs index 3612d75499..b21a9e766b 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs @@ -105,7 +105,7 @@ namespace BizHawk.Client.EmuHawk this.TasStatusStrip = new StatusStripEx(); this.MessageStatusLabel = new System.Windows.Forms.ToolStripStatusLabel(); this.SplicerStatusLabel = new System.Windows.Forms.ToolStripStatusLabel(); - this.TasPlaybackBox = new BizHawk.Client.EmuHawk.PlaybackBox(); + this.TasPlaybackBox = new BizHawk.Client.EmuHawk.PlaybackBox(this); this.MarkerControl = new BizHawk.Client.EmuHawk.MarkerControl(); this.MarkerContextMenu = new System.Windows.Forms.ContextMenuStrip(this.components); this.EditMarkerContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();