From 2052e15a0865936381bd21bd2fb728f508848398 Mon Sep 17 00:00:00 2001
From: CozmoP <25121396+CozmoP@users.noreply.github.com>
Date: Sat, 12 Jan 2019 00:51:44 +0100
Subject: [PATCH] pass content label when loading content from Qt (#7982)

---
 gfx/common/win32_common.c      |  2 +-
 tasks/task_content.c           | 11 +++++++++++
 tasks/tasks_internal.h         |  1 +
 ui/drivers/qt/ui_qt_window.cpp |  2 +-
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/gfx/common/win32_common.c b/gfx/common/win32_common.c
index 09dd177c5a..773cf408fb 100644
--- a/gfx/common/win32_common.c
+++ b/gfx/common/win32_common.c
@@ -487,7 +487,7 @@ bool win32_load_content_from_gui(const char *szFilename)
       if (info)
       {
          task_push_load_content_with_new_core_from_companion_ui(
-            info->path, NULL, &content_info, NULL, NULL);
+            info->path, NULL, NULL, &content_info, NULL, NULL);
          return true;
       }
    }
diff --git a/tasks/task_content.c b/tasks/task_content.c
index 25bed6a350..79beb659d9 100644
--- a/tasks/task_content.c
+++ b/tasks/task_content.c
@@ -1591,10 +1591,13 @@ end:
 bool task_push_load_content_with_new_core_from_companion_ui(
       const char *core_path,
       const char *fullpath,
+      const char *label,
       content_ctx_info_t *content_info,
       retro_task_callback_t cb,
       void *user_data)
 {
+   global_t *global = global_get_ptr();
+
    /* Set content path */
    path_set(RARCH_PATH_CONTENT, fullpath);
 
@@ -1606,6 +1609,14 @@ bool task_push_load_content_with_new_core_from_companion_ui(
 
    _launched_from_cli = false;
 
+   if (global)
+   {
+      if (label)
+         strlcpy(global->name.label, label, sizeof(global->name.label));
+      else
+         global->name.label[0] = '\0';
+   }
+
    /* Load content */
    if (!task_load_content_callback(content_info, true, false))
       return false;
diff --git a/tasks/tasks_internal.h b/tasks/tasks_internal.h
index df6a03fd43..16d44d8631 100644
--- a/tasks/tasks_internal.h
+++ b/tasks/tasks_internal.h
@@ -184,6 +184,7 @@ bool task_push_start_dummy_core(content_ctx_info_t *content_info);
 bool task_push_load_content_with_new_core_from_companion_ui(
       const char *core_path,
       const char *fullpath,
+      const char *label,
       content_ctx_info_t *content_info,
       retro_task_callback_t cb,
       void *user_data);
diff --git a/ui/drivers/qt/ui_qt_window.cpp b/ui/drivers/qt/ui_qt_window.cpp
index effb89760e..6870148e92 100644
--- a/ui/drivers/qt/ui_qt_window.cpp
+++ b/ui/drivers/qt/ui_qt_window.cpp
@@ -1748,7 +1748,7 @@ void MainWindow::loadContent(const QHash<QString, QString> &contentHash)
    command_event(CMD_EVENT_UNLOAD_CORE, NULL);
 
    if (!task_push_load_content_with_new_core_from_companion_ui(
-         corePath, contentPath, &content_info,
+         corePath, contentPath, contentLabel, &content_info,
          NULL, NULL))
    {
       QMessageBox::critical(this, msg_hash_to_str(MSG_ERROR), msg_hash_to_str(MSG_FAILED_TO_LOAD_CONTENT));