From 771efdabc0e21b5b391ac58c52687ea67dee2f57 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sun, 26 Nov 2017 03:01:28 +0100
Subject: [PATCH] Fix edge case issue where game's label was not being properly
 set when loading two games one after another from a playlist/collection - the
 previous game's name was being used instead

---
 menu/cbs/menu_cbs_ok.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c
index 157710ec01..7fea03125c 100644
--- a/menu/cbs/menu_cbs_ok.c
+++ b/menu/cbs/menu_cbs_ok.c
@@ -1497,8 +1497,16 @@ static int action_ok_playlist_entry_collection(const char *path,
    if (system &&
          string_is_equal(system->library_name, core_name))
    {
+      global_t  *global  = global_get_ptr();
+
       if (playlist_initialized)
          playlist_free(tmp_playlist);
+      if (global)
+      {
+         global->name.label[0] = '\0';
+         if (!string_is_empty(entry_label))
+            strlcpy(global->name.label, entry_label, sizeof(global->name.label));
+      }
       return action_ok_file_load(menu->deferred_path, label, type, idx, entry_idx);
    }