From f9dad99484b449ea435be458d1ab30d1a4a9f64a Mon Sep 17 00:00:00 2001 From: adelikat Date: Sun, 12 Jul 2015 12:45:30 -0400 Subject: [PATCH] Tastudio - fix crash when loading a tasproj with a different controller configuration than the current --- BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs index 6061dff40c..3f316cfbe3 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs @@ -209,15 +209,15 @@ namespace BizHawk.Client.EmuHawk CurrentTasMovie.ClientSettingsForSave = ClientSettingsForSave; CurrentTasMovie.GetClientSettingsOnLoad = GetClientSettingsOnLoad; } + private string ClientSettingsForSave() { return TasView.UserSettingsSerialized(); } + private void GetClientSettingsOnLoad(string settingsJson) { TasView.LoadSettingsSerialized(settingsJson); - RefreshTasView(); - SetUpToolStripColumns(); }