diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.cs index 000ba836ea..7d6b74beea 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.cs @@ -15,11 +15,10 @@ namespace BizHawk.Client.EmuHawk { public TasMovieMarkerList Markers {get; set; } - private readonly TAStudio _tastudio; + public TAStudio Tastudio { get; set; } - public MarkerControl(TAStudio tastudio) + public MarkerControl() { - _tastudio = tastudio; InitializeComponent(); MarkerView.QueryItemBkColor += MarkerView_QueryItemBkColor; MarkerView.QueryItemText += MarkerView_QueryItemText; @@ -64,7 +63,7 @@ namespace BizHawk.Client.EmuHawk private void AddBtn_Click(object sender, EventArgs e) { - _tastudio.CallAddMarkerPopUp(); + Tastudio.CallAddMarkerPopUp(); } public new void Refresh() @@ -85,7 +84,7 @@ namespace BizHawk.Client.EmuHawk private void RemoveBtn_Click(object sender, EventArgs e) { SelectedMarkers.ForEach(i => Markers.Remove(i)); - _tastudio.RefreshDialog(); + Tastudio.RefreshDialog(); } private IEnumerable SelectedIndices diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs index 6f0ed1678f..036bc1f517 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs @@ -107,7 +107,7 @@ namespace BizHawk.Client.EmuHawk this.MessageStatusLabel = new System.Windows.Forms.ToolStripStatusLabel(); this.SplicerStatusLabel = new System.Windows.Forms.ToolStripStatusLabel(); this.TasPlaybackBox = new BizHawk.Client.EmuHawk.PlaybackBox(); - this.MarkerControl = new BizHawk.Client.EmuHawk.MarkerControl(this); + this.MarkerControl = new BizHawk.Client.EmuHawk.MarkerControl(); this.TASMenu.SuspendLayout(); this.TasStatusStrip.SuspendLayout(); this.SuspendLayout(); diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs index ae8f4d4815..3a964f8f96 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs @@ -68,6 +68,7 @@ namespace BizHawk.Client.EmuHawk public TAStudio() { InitializeComponent(); + MarkerControl.Tastudio = this; TasView.QueryItemText += TasView_QueryItemText; TasView.QueryItemBkColor += TasView_QueryItemBkColor; TasView.VirtualMode = true;