Skip to content

Commit 90f2b27

Browse files
committed
Change tastudio.getmarker to return nil (not empty string) on fail
1 parent ff04b85 commit 90f2b27

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
@@ -447,9 +447,9 @@ public void LoadBranch(int index)
447447
[LuaMethod(
448448
name: "getmarker",
449449
description: "Returns the label of the marker on the given frame."
450-
+ " If that frame doesn't have a marker (or TAStudio isn't running), returns an empty string."
450+
+ " If that frame doesn't have a marker (or TAStudio isn't running), returns nil."
451451
+ " If branchIndex is specified, searches the markers in that branch instead.")]
452-
public string GetMarker(int frame, int? branchIndex = null)
452+
public string/*?*/ GetMarker(int frame, int? branchIndex = null)
453453
{
454454
if (Engaged())
455455
{
@@ -460,7 +460,7 @@ public string GetMarker(int frame, int? branchIndex = null)
460460
}
461461
}
462462

463-
return "";
463+
return null;
464464
}
465465

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

0 commit comments

Comments
 (0)