From 433d4ad69318f22c1ca56303fceabe33470c47f3 Mon Sep 17 00:00:00 2001 From: feos Date: Thu, 17 Nov 2016 21:30:42 +0300 Subject: [PATCH] tastudio: revive ColumnsChangedCallback, and alarm if it dies again --- BizHawk.Client.EmuHawk/CustomControls/InputRoll.cs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/BizHawk.Client.EmuHawk/CustomControls/InputRoll.cs b/BizHawk.Client.EmuHawk/CustomControls/InputRoll.cs index 9ede3df2e0..c3bcb3b3c4 100644 --- a/BizHawk.Client.EmuHawk/CustomControls/InputRoll.cs +++ b/BizHawk.Client.EmuHawk/CustomControls/InputRoll.cs @@ -614,6 +614,7 @@ namespace BizHawk.Client.EmuHawk { var rollSettings = settings as InputRollSettings; _columns = rollSettings.Columns; + _columns.ChangedCallback = ColumnChangedCallback; HorizontalOrientation = rollSettings.HorizontalOrientation; LagFramesToHide = rollSettings.LagFramesToHide; HideWasLagFrames = rollSettings.HideWasLagFrames; @@ -2017,10 +2018,11 @@ namespace BizHawk.Client.EmuHawk private void DoChangeCallback() { - if (ChangedCallback != null) - { + // no check will make it crash for user too, not sure which way of alarm we prefer. no alarm at all will cause all sorts of subtle bugs + if (ChangedCallback == null) + System.Diagnostics.Debug.Fail("ColumnChangedCallback has died!"); + else ChangedCallback(); - } } // TODO: this shouldn't be exposed. But in order to not expose it, each RollColumn must have a change callback, and all property changes must call it, it is quicker and easier to just call this when needed