Skip to content

Commit 929098e

Browse files
committed
Change tastudio.getmarker to return nil (not empty string) on fail
1 parent 0a39377 commit 929098e

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/BizHawk.Client.EmuHawk/tools/Lua/Libraries/TAStudioLuaLibrary.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -462,9 +462,9 @@ public void LoadBranch(int index)
462462
[LuaMethod(
463463
name: "getmarker",
464464
description: "Returns the label of the marker on the given frame."
465-
+ " If that frame doesn't have a marker (or TAStudio isn't running), returns an empty string."
465+
+ " If that frame doesn't have a marker (or TAStudio isn't running), returns nil."
466466
+ " If branchID is specified, searches the markers in that branch instead.")]
467-
public string GetMarker(int frame, string/*?*/ branchID = null)
467+
public string/*?*/ GetMarker(int frame, string/*?*/ branchID = null)
468468
{
469469
if (Engaged())
470470
{
@@ -475,7 +475,7 @@ public string GetMarker(int frame, string/*?*/ branchID = null)
475475
}
476476
}
477477

478-
return "";
478+
return null;
479479
}
480480

481481
/// <remarks>assumes a TAStudio project is loaded</remarks>

0 commit comments

Comments
 (0)