Fix for exception in marker window

This commit is contained in:
alyosha-tas 2016-12-13 22:37:06 -05:00 committed by GitHub
parent f723abe478
commit 0c3da629c8
1 changed files with 4 additions and 1 deletions

View File

@ -52,8 +52,11 @@ namespace BizHawk.Client.EmuHawk
private void MarkerView_QueryItemBkColor(int index, InputRoll.RollColumn column, ref Color color)
{
var prev = Markers.PreviousOrCurrent(Emulator.Frame);//Temp fix
var prev = Markers.PreviousOrCurrent(0);
if (this.Emulator!=null) //Temp fix
prev = Markers.PreviousOrCurrent(Emulator.Frame);
if (prev != null && index == Markers.IndexOf(prev))
{
color = TAStudio.Marker_FrameCol;