sgilissen/llamaplayer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Qt: Move resources out of exe into rcc file

Browse Source
This commit is contained in:
Stenzek
2024-06-30 12:36:05 +10:00
parent 8c0af03448
commit 0d3e674500
6 changed files with 27 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/duckstation-qt/qthost.cpp
View File

@ -479,10 +479,12 @@ bool QtHost::SetCriticalFolders()
CrashHandler::SetWriteDirectory(EmuFolders::DataRoot);
// the resources directory should exist, bail out if not
if (!FileSystem::DirectoryExists(EmuFolders::Resources.c_str()))
const std::string rcc_path = Path::Combine(EmuFolders::Resources, "duckstation-qt.rcc");
if (!FileSystem::DirectoryExists(EmuFolders::Resources.c_str()) || !FileSystem::FileExists(rcc_path.c_str()) ||
!QResource::registerResource(QString::fromStdString(rcc_path)))
{
QMessageBox::critical(nullptr, QStringLiteral("Error"),
QStringLiteral("Resources directory is missing, your installation is incomplete."));
QStringLiteral("Resources are missing, your installation is incomplete."));
return false;
}
@ -2415,7 +2417,7 @@ bool QtHost::ParseCommandLineParametersAndInitializeConfig(QApplication& app,
}
// To do anything useful, we need the config initialized.
if (!QtHost::InitializeConfig(std::move(settings_filename)))
if (!InitializeConfig(std::move(settings_filename)))
{
// NOTE: No point translating this, because no config means the language won't be loaded anyway.
QMessageBox::critical(nullptr, QStringLiteral("Error"), QStringLiteral("Failed to initialize config."));