diff options
author | liamwhite <liamwhite@users.noreply.github.com> | 2022-08-07 19:04:24 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-08-07 19:04:24 -0400 |
commit | 167d948ce163ba55fcf7434362b7593000a1c60c (patch) | |
tree | f6536bbc4599572918b2aa4f173f5a6b5f09ac99 /src | |
parent | b210efefb030146b9e410ea6374273a4e76ddb3c (diff) | |
parent | e2123b27e8a17a743cdf446c3e9eef0126e0d069 (diff) |
Merge pull request #8730 from lat9nq/fmt-9.0.0
vcpkg,yuzu: Update to fmt 9.0.0
Diffstat (limited to 'src')
-rw-r--r-- | src/yuzu/bootmanager.cpp | 4 | ||||
-rw-r--r-- | src/yuzu/main.cpp | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/yuzu/bootmanager.cpp b/src/yuzu/bootmanager.cpp index ef3bdfb1a..c262d0a2b 100644 --- a/src/yuzu/bootmanager.cpp +++ b/src/yuzu/bootmanager.cpp @@ -1089,8 +1089,8 @@ QStringList GRenderWindow::GetUnsupportedGLExtensions() const { } if (!unsupported_ext.empty()) { - LOG_ERROR(Frontend, "GPU does not support all required extensions: {}", - glGetString(GL_RENDERER)); + const std::string gl_renderer{reinterpret_cast<const char*>(glGetString(GL_RENDERER))}; + LOG_ERROR(Frontend, "GPU does not support all required extensions: {}", gl_renderer); } for (const QString& ext : unsupported_ext) { LOG_ERROR(Frontend, "Unsupported GL extension: {}", ext.toStdString()); diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index dc7b343d9..653280642 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp @@ -3338,7 +3338,8 @@ void GMainWindow::MigrateConfigFiles() { } const auto origin = config_dir_fs_path / filename; const auto destination = config_dir_fs_path / "custom" / filename; - LOG_INFO(Frontend, "Migrating config file from {} to {}", origin, destination); + LOG_INFO(Frontend, "Migrating config file from {} to {}", origin.string(), + destination.string()); if (!Common::FS::RenameFile(origin, destination)) { // Delete the old config file if one already exists in the new location. Common::FS::RemoveFile(origin); |