summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2019-05-20 20:50:05 +0200
committerLioncash <mathew1800@gmail.com>2019-05-20 20:50:53 +0200
commitfd34732e2683c0342ea481ca43786f1e8ff4cf4d (patch)
tree98d46627ada2c194005e6680a9c91ec5ba26bc3e
parentyuzu/util: Specify string conversions explicitly (diff)
downloadyuzu-fd34732e2683c0342ea481ca43786f1e8ff4cf4d.tar
yuzu-fd34732e2683c0342ea481ca43786f1e8ff4cf4d.tar.gz
yuzu-fd34732e2683c0342ea481ca43786f1e8ff4cf4d.tar.bz2
yuzu-fd34732e2683c0342ea481ca43786f1e8ff4cf4d.tar.lz
yuzu-fd34732e2683c0342ea481ca43786f1e8ff4cf4d.tar.xz
yuzu-fd34732e2683c0342ea481ca43786f1e8ff4cf4d.tar.zst
yuzu-fd34732e2683c0342ea481ca43786f1e8ff4cf4d.zip
-rw-r--r--src/yuzu/bootmanager.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/yuzu/bootmanager.cpp b/src/yuzu/bootmanager.cpp
index 810954b36..c2783d684 100644
--- a/src/yuzu/bootmanager.cpp
+++ b/src/yuzu/bootmanager.cpp
@@ -188,7 +188,9 @@ private:
GRenderWindow::GRenderWindow(QWidget* parent, EmuThread* emu_thread)
: QWidget(parent), emu_thread(emu_thread) {
setWindowTitle(QStringLiteral("yuzu %1 | %2-%3")
- .arg(Common::g_build_name, Common::g_scm_branch, Common::g_scm_desc));
+ .arg(QString::fromUtf8(Common::g_build_name),
+ QString::fromUtf8(Common::g_scm_branch),
+ QString::fromUtf8(Common::g_scm_desc)));
setAttribute(Qt::WA_AcceptTouchEvents);
InputCommon::Init();
@@ -217,7 +219,7 @@ void GRenderWindow::SwapBuffers() {
// However:
// - The Qt debug runtime prints a bogus warning on the console if `makeCurrent` wasn't called
// since the last time `swapBuffers` was executed;
- // - On macOS, if `makeCurrent` isn't called explicitely, resizing the buffer breaks.
+ // - On macOS, if `makeCurrent` isn't called explicitly, resizing the buffer breaks.
context->makeCurrent(child);
context->swapBuffers(child);