summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar LittleWhite2016-03-06 14:04:47 +0100
committerGravatar LittleWhite2016-03-07 19:51:35 +0100
commit9d8a7242253dc63f548728fc9c3512d772720ee2 (patch)
treec9239a4293fdc8695de370e4513e882c73e4f78e /src
parentMerge pull request #1463 from yuriks/non-app-region (diff)
downloadyuzu-9d8a7242253dc63f548728fc9c3512d772720ee2.tar.gz
yuzu-9d8a7242253dc63f548728fc9c3512d772720ee2.tar.xz
yuzu-9d8a7242253dc63f548728fc9c3512d772720ee2.zip
Set the appropriate locale to get float conversion working using std::to_string
Diffstat (limited to 'src')
-rw-r--r--src/citra_qt/main.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp
index da9ea6c91..1854f442a 100644
--- a/src/citra_qt/main.cpp
+++ b/src/citra_qt/main.cpp
@@ -2,6 +2,7 @@
2// Licensed under GPLv2 or any later version 2// Licensed under GPLv2 or any later version
3// Refer to the license.txt file included. 3// Refer to the license.txt file included.
4 4
5#include <clocale>
5#include <thread> 6#include <thread>
6 7
7#include <QDesktopWidget> 8#include <QDesktopWidget>
@@ -563,6 +564,9 @@ int main(int argc, char* argv[]) {
563 QApplication::setAttribute(Qt::AA_X11InitThreads); 564 QApplication::setAttribute(Qt::AA_X11InitThreads);
564 QApplication app(argc, argv); 565 QApplication app(argc, argv);
565 566
567 // Qt changes the locale and causes issues in float conversion using std::to_string() when generating shaders
568 setlocale(LC_ALL, "C");
569
566 GMainWindow main_window; 570 GMainWindow main_window;
567 // After settings have been loaded by GMainWindow, apply the filter 571 // After settings have been loaded by GMainWindow, apply the filter
568 log_filter.ParseFilterString(Settings::values.log_filter); 572 log_filter.ParseFilterString(Settings::values.log_filter);