diff --git a/rpcs3/headless_application.cpp b/rpcs3/headless_application.cpp index 75470770df..0c10f5a313 100644 --- a/rpcs3/headless_application.cpp +++ b/rpcs3/headless_application.cpp @@ -9,8 +9,6 @@ #include -#include - // For now, a trivial constructor/destructor. May add command line usage later. headless_application::headless_application(int& argc, char** argv) : QCoreApplication(argc, argv) { @@ -134,11 +132,6 @@ void headless_application::InitializeCallbacks() callbacks.play_sound = [](const std::string&){}; - callbacks.resolve_path = [](std::string_view sv) - { - return QFileInfo(QString::fromUtf8(sv.data(), static_cast(sv.size()))).canonicalFilePath().toStdString(); - }; - Emu.SetCallbacks(std::move(callbacks)); } diff --git a/rpcs3/main_application.cpp b/rpcs3/main_application.cpp index 12c78b0666..02f533201a 100644 --- a/rpcs3/main_application.cpp +++ b/rpcs3/main_application.cpp @@ -32,6 +32,8 @@ #include "Emu/Audio/FAudio/FAudioBackend.h" #endif +#include // This shouldn't be outside rpcs3qt... + LOG_CHANNEL(sys_log, "SYS"); /** Emu.Init() wrapper for user management */ @@ -134,5 +136,10 @@ EmuCallbacks main_application::CreateCallbacks() return result; }; + callbacks.resolve_path = [](std::string_view sv) + { + return QFileInfo(QString::fromUtf8(sv.data(), static_cast(sv.size()))).canonicalFilePath().toStdString(); + }; + return callbacks; } diff --git a/rpcs3/rpcs3qt/gui_application.cpp b/rpcs3/rpcs3qt/gui_application.cpp index 6568cbd708..76b1814d75 100644 --- a/rpcs3/rpcs3qt/gui_application.cpp +++ b/rpcs3/rpcs3qt/gui_application.cpp @@ -419,11 +419,6 @@ void gui_application::InitializeCallbacks() }); }; - callbacks.resolve_path = [](std::string_view sv) - { - return QFileInfo(QString::fromUtf8(sv.data(), static_cast(sv.size()))).canonicalFilePath().toStdString(); - }; - Emu.SetCallbacks(std::move(callbacks)); }