aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/common/scm_rev.cpp.in1
-rw-r--r--src/qt_common/game_list/worker.cpp3
2 files changed, 3 insertions, 1 deletions
diff --git a/src/common/scm_rev.cpp.in b/src/common/scm_rev.cpp.in
index 21e58e24b5..5fe066d7d9 100644
--- a/src/common/scm_rev.cpp.in
+++ b/src/common/scm_rev.cpp.in
@@ -13,6 +13,7 @@
#define BUILD_DATE "@BUILD_DATE@"
#define BUILD_FULLNAME "@BUILD_FULLNAME@"
#define BUILD_VERSION "@BUILD_VERSION@"
+#undef BUILD_ID
#define BUILD_ID "@BUILD_ID@"
#define TITLE_BAR_FORMAT_IDLE "@TITLE_BAR_FORMAT_IDLE@"
#define TITLE_BAR_FORMAT_RUNNING "@TITLE_BAR_FORMAT_RUNNING@"
diff --git a/src/qt_common/game_list/worker.cpp b/src/qt_common/game_list/worker.cpp
index bd3d81dac4..329fc06990 100644
--- a/src/qt_common/game_list/worker.cpp
+++ b/src/qt_common/game_list/worker.cpp
@@ -18,6 +18,7 @@
#include <QSettings>
#include "common/fs/fs.h"
+#include "common/fs/fs_util.h"
#include "common/fs/path_util.h"
#include "common/settings.h"
#include "core/core.h"
@@ -552,7 +553,7 @@ void GameListWorker::run() {
DirEntryReady(game_list_dir);
if (scan) {
const auto discovery = GameListDiscovery::Discover(
- std::filesystem::u8path(game_dir.path), game_dir.deep_scan,
+ std::filesystem::path(Common::FS::ToU8String(game_dir.path)), game_dir.deep_scan,
[](const auto& path) {
const auto name = Common::FS::PathToUTF8String(path);
return HasSupportedFileExtension(name) || IsExtractedNCAMain(name);