summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2016-03-07 20:23:48 -0500
committerbunnei <bunneidev@gmail.com>2016-03-07 20:23:48 -0500
commitb12a0b753f72a17b9a6ebbdf95833efaa322964f (patch)
tree1ca8f86d193cb70d97e31b7dfdd5ca3a8ac0e35c /src
parent6436d101b5d623aa7c5a854bf3b28fbefe2d5198 (diff)
parent9d8a7242253dc63f548728fc9c3512d772720ee2 (diff)
Merge pull request #1467 from LittleWhite-tb/bug-shader-object
Set the appropriate locale to get float conversion working using 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 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
+#include <clocale>
#include <thread>
#include <QDesktopWidget>
@@ -563,6 +564,9 @@ int main(int argc, char* argv[]) {
QApplication::setAttribute(Qt::AA_X11InitThreads);
QApplication app(argc, argv);
+ // Qt changes the locale and causes issues in float conversion using std::to_string() when generating shaders
+ setlocale(LC_ALL, "C");
+
GMainWindow main_window;
// After settings have been loaded by GMainWindow, apply the filter
log_filter.ParseFilterString(Settings::values.log_filter);