make sarg explicit in lua songman chartkey functions and return nil i…

…nstead of a null object
etternagame · May 2, 2017 · 789181f · 789181f
1 parent a5ec3ed
commit 789181f
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/src/SongManager.cpp b/src/SongManager.cpp
@@ -2305,14 +2305,22 @@ class LunaSongManager: public Luna<SongManager>
 	}
 	static int GetSongByChartKey(T* p, lua_State *L)
 	{
-		Song* pSong = p->GetSongByChartkey(SArg(1));
-		pSong->PushSelf(L);
+		RString ck = SArg(1);
+		Song* pSong = p->GetSongByChartkey(ck);
+		if (pSong)
+			pSong->PushSelf(L);
+		else
+			lua_pushnil(L);
 		return 1;
 	}
 	static int GetStepsByChartKey(T* p, lua_State *L)
 	{
-		Steps* pSteps = p->GetStepsByChartkey(SArg(1));
-		pSteps->PushSelf(L);
+		RString ck = SArg(1);
+		Steps* pSteps = p->GetStepsByChartkey(ck);
+		if (pSteps)
+			pSteps->PushSelf(L);
+		else
+			lua_pushnil(L);
 		return 1;
 	}