fix: NPE when game has "Disc" in name (#535)

libretro · Mar 9, 2024 · f83948d · f83948d
1 parent 5c12453
commit f83948d
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/menu/scene_playlist.go b/menu/scene_playlist.go
@@ -23,12  23,11 @@ func buildPlaylist(path string) Scene {
 	var list scenePlaylist
 	list.label = utils.FileName(path)
 
 	re := regexp.MustCompile(`\(([Dd]isc [1-9]?)\)`)
 	for _, game := range playlists.Playlists[path] {
 		game := game // needed for callbackOK
 		strippedName, tags := extractTags(game.Name)
-		if strings.Contains(game.Name, "Disc") {
-			re := regexp.MustCompile(`\((Disc [1-9]?)\)`)
-			match := re.FindStringSubmatch(game.Name)
 		if match := re.FindStringSubmatch(game.Name); len(match) >= 2 {
 			strippedName = strippedName   " ("   match[1]   ")"
 		}
 		list.children = append(list.children, entry{