tastudio:

- fix recursion in cell updates caused by clicking cursor column (fixes scrolling)
- display invalidated color consistently

n64: fix trace callback prototype

BizHawk.Client.EmuHawk/CustomControls/InputRoll.cs

@@ -1428,8 +1428,14 @@ namespace BizHawk.Client.EmuHawk
 				}
 			}
 
+			if (CurrentCell == null)
+				return;
+
 			if (!GlobalWin.MainForm.EmulatorPaused && _currentX.HasValue)
 			{
+				if (CurrentCell.Column.Name == "CursorColumn" && IsPaintDown)
+					return;
+
 				// copypaste from OnMouseMove()
 				Cell newCell = CalculatePointedCell(_currentX.Value, _currentY.Value);
 				if (QueryFrameLag != null && newCell.RowIndex.HasValue)

BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs

@@ -245,14 +245,9 @@ namespace BizHawk.Client.EmuHawk
 			}
 			else if (record.WasLagged.HasValue)
 			{
-				if (!record.HasState && TasView.denoteStatesWithBGColor)
-					color = record.WasLagged.Value ?
-						LagZone_InputLog_Invalidated :
-						GreenZone_InputLog_Invalidated;
-				else
-					color = record.WasLagged.Value ?
-						LagZone_InputLog_Stated :
-						GreenZone_InputLog_Stated;
+				color = record.WasLagged.Value ?
+					LagZone_InputLog_Invalidated :
+					GreenZone_InputLog_Invalidated;
 			}
 			else
 			{

libmupen64plus/mupen64plus-core/src/memory/memory.c

@@ -4052,7 +4052,7 @@ EXPORT void CALL SetExecuteCallback(void (*CB)(unsigned int))
 	executeCB = CB;
 }
 
-EXPORT void CALL SetTraceCallback(void (*CB)(unsigned int))
+EXPORT void CALL SetTraceCallback(void (*CB)(void))
 {
 	traceCB = CB;
 }