libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2025-02-25 04:10:39 +00:00
Code Issues Actions 25 Packages Projects Releases Wiki Activity

pass content label when loading content from Qt (#7982)

Browse Source
This commit is contained in:
CozmoP 2019-01-12 00:51:44 +01:00 committed by bparker06
parent 2231e4c821
commit 2052e15a08
4 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gfx/common/win32_common.c
View File

@ -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;
}
}

11
tasks/task_content.c
View File

@ -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;

1
tasks/tasks_internal.h
View File

@ -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);

2
ui/drivers/qt/ui_qt_window.cpp
View File

@ -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));