diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs index 52ae09bd32..1c914e6415 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs @@ -1403,23 +1403,8 @@ namespace BizHawk.Client.EmuHawk RefreshTasView(); CurrentTasMovie.FlagChanges(); - try - { - MainVertialSplit.SplitterDistance = Settings.MainVerticalSplitDistance; - } - catch (Exception) - { - MainVertialSplit.SplitterDistance = _defaultMainSplitDistance; - } - - try - { - BranchesMarkersSplit.SplitterDistance = Settings.BranchMarkerSplitDistance; - } - catch (Exception) - { - BranchesMarkersSplit.SplitterDistance = _defaultBranchMarkerSplitDistance; - } + MainVertialSplit.SplitterDistance = _defaultMainSplitDistance; + BranchesMarkersSplit.SplitterDistance = _defaultBranchMarkerSplitDistance; } #endregion diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs index 19136e07e7..f45de742a6 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs @@ -33,8 +33,8 @@ namespace BizHawk.Client.EmuHawk private UndoHistoryForm _undoForm; private Timer _autosaveTimer; - private int _defaultMainSplitDistance; - private int _defaultBranchMarkerSplitDistance; + private readonly int _defaultMainSplitDistance; + private readonly int _defaultBranchMarkerSplitDistance; /// /// Gets a value that separates "restore last position" logic from seeking caused by navigation. @@ -273,22 +273,6 @@ namespace BizHawk.Client.EmuHawk } // Remembering Split container logic - int defaultMainSplitDistance = MainVertialSplit.SplitterDistance; - int defaultBranchMarkerSplitDistance = BranchesMarkersSplit.SplitterDistance; - - ToolStripMenuItem restoreDefaults = TASMenu.Items - .OfType() - .Single(t => t.Name == "SettingsSubMenu") - .DropDownItems - .OfType() - .Single(t => t.Text == "Restore &Defaults"); - - restoreDefaults.Click += (o, ev) => - { - MainVertialSplit.SplitterDistance = defaultMainSplitDistance; - BranchesMarkersSplit.SplitterDistance = defaultBranchMarkerSplitDistance; - }; - if (Settings.MainVerticalSplitDistance > 0) { try @@ -297,7 +281,7 @@ namespace BizHawk.Client.EmuHawk } catch (Exception) { - MainVertialSplit.SplitterDistance = defaultMainSplitDistance; + MainVertialSplit.SplitterDistance = _defaultMainSplitDistance; } } @@ -310,7 +294,7 @@ namespace BizHawk.Client.EmuHawk } catch (Exception) { - BranchesMarkersSplit.SplitterDistance = defaultBranchMarkerSplitDistance; + BranchesMarkersSplit.SplitterDistance = _defaultBranchMarkerSplitDistance; } } diff --git a/BizHawk.Client.EmuHawk/tools/ToolManager.cs b/BizHawk.Client.EmuHawk/tools/ToolManager.cs index 1c0a1c17e7..86973efc73 100644 --- a/BizHawk.Client.EmuHawk/tools/ToolManager.cs +++ b/BizHawk.Client.EmuHawk/tools/ToolManager.cs @@ -42,7 +42,7 @@ namespace BizHawk.Client.EmuHawk /// Type of tool you want to load /// Define if the tool form has to get the focus or not (Default is true) /// An instantiated - /// Raised if can't be casted into IToolForm + /// Raised if can't cast into IToolForm internal IToolForm Load(Type toolType, bool focus = true) { if (!typeof(IToolForm).IsAssignableFrom(toolType))