diff options
| author | 2016-03-07 20:23:48 -0500 | |
|---|---|---|
| committer | 2016-03-07 20:23:48 -0500 | |
| commit | b12a0b753f72a17b9a6ebbdf95833efaa322964f (patch) | |
| tree | 1ca8f86d193cb70d97e31b7dfdd5ca3a8ac0e35c /src | |
| parent | Merge pull request #1462 from yuriks/depth-test-write (diff) | |
| parent | Set the appropriate locale to get float conversion working using std::to_string (diff) | |
| download | yuzu-b12a0b753f72a17b9a6ebbdf95833efaa322964f.tar.gz yuzu-b12a0b753f72a17b9a6ebbdf95833efaa322964f.tar.xz yuzu-b12a0b753f72a17b9a6ebbdf95833efaa322964f.zip | |
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.cpp | 4 |
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); |