From c60fdf0b2e947668370c69d5928b4008362b1131 Mon Sep 17 00:00:00 2001 From: Brad Parker Date: Wed, 5 Sep 2018 00:07:11 -0400 Subject: [PATCH] Qt: fix duplicate function name with griffin --- ui/drivers/qt/thumbnailpackdownload.cpp | 4 ++-- ui/drivers/qt/updateretroarch.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ui/drivers/qt/thumbnailpackdownload.cpp b/ui/drivers/qt/thumbnailpackdownload.cpp index a9b551498b..df4b68145c 100644 --- a/ui/drivers/qt/thumbnailpackdownload.cpp +++ b/ui/drivers/qt/thumbnailpackdownload.cpp @@ -21,7 +21,7 @@ extern "C" { #define THUMBNAILPACK_URL_HEADER "http://thumbnailpacks.libretro.com/" #define THUMBNAILPACK_EXTENSION ".zip" -static void extractCB(void *task_data, void *user_data, const char *err) +static void extractThumbnailPackCB(void *task_data, void *user_data, const char *err) { decompress_task_data_t *dec = (decompress_task_data_t*)task_data; MainWindow *mainwindow = (MainWindow*)user_data; @@ -167,7 +167,7 @@ void MainWindow::onThumbnailPackDownloadFinished() if (settings) { RARCH_LOG("[Qt]: Thumbnail pack download finished successfully.\n"); - emit extractArchiveDeferred(newFileName, settings->paths.directory_thumbnails, TEMP_EXTENSION, extractCB); + emit extractArchiveDeferred(newFileName, settings->paths.directory_thumbnails, TEMP_EXTENSION, extractThumbnailPackCB); } } else diff --git a/ui/drivers/qt/updateretroarch.cpp b/ui/drivers/qt/updateretroarch.cpp index 9f524abc9e..0952a5e094 100644 --- a/ui/drivers/qt/updateretroarch.cpp +++ b/ui/drivers/qt/updateretroarch.cpp @@ -18,7 +18,7 @@ extern "C" { #define TEMP_EXTENSION ".update_tmp" #define RETROARCH_NIGHTLY_UPDATE_PATH "../RetroArch_update.zip" -static void extractCB(void *task_data, void *user_data, const char *err) +static void extractUpdateCB(void *task_data, void *user_data, const char *err) { decompress_task_data_t *dec = (decompress_task_data_t*)task_data; MainWindow *mainwindow = (MainWindow*)user_data; @@ -157,7 +157,7 @@ void MainWindow::onRetroArchUpdateDownloadFinished() if (m_updateFile.rename(newFileName)) { RARCH_LOG("[Qt]: RetroArch update finished downloading successfully.\n"); - emit extractArchiveDeferred(newFileName, ".", TEMP_EXTENSION, extractCB); + emit extractArchiveDeferred(newFileName, ".", TEMP_EXTENSION, extractUpdateCB); } else {