From a77b7ce2fcd7bfd410f7b2a29d89b48da5d2b7e3 Mon Sep 17 00:00:00 2001 From: adelikat Date: Fri, 13 Dec 2019 17:33:54 -0600 Subject: [PATCH] TAstudio - fix NRE that can happen from a sloppy right-click that causes a sloppy right-click context menu to open --- BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs index c734a55298..5baa5a1dfe 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs @@ -1489,7 +1489,7 @@ namespace BizHawk.Client.EmuHawk StartFromNowSeparator.Visible = StartNewProjectFromNowMenuItem.Visible || StartANewProjectFromSaveRamMenuItem.Visible; RemoveMarkersContextMenuItem.Enabled = CurrentTasMovie.Markers.Any(m => TasView.SelectedRows.Contains(m.Frame)); // Disable the option to remove markers if no markers are selected (FCEUX does this). CancelSeekContextMenuItem.Enabled = Mainform.PauseOnFrame.HasValue; - BranchContextMenuItem.Visible = TasView.CurrentCell.RowIndex == Emulator.Frame; + BranchContextMenuItem.Visible = TasView.CurrentCell?.RowIndex == Emulator.Frame; SelectBetweenMarkersContextMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Sel. bet. Markers"].Bindings; InsertNumFramesContextMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Insert # Frames"].Bindings;