diff options
| author |  bunnei | 2021-04-29 21:49:05 -0700 |
|---|---|---|
| committer |  GitHub | 2021-04-29 21:49:05 -0700 |
| commit | bea6fca9a1ea2adf6950518458c5b69892e0c9a2 (patch) | |
| tree | 71119d4d8f61183e00d6bad0ff6768391f0eb701 | |
| parent | Merge pull request #6259 from Morph1984/main-conv (diff) | |
| parent | yuzu: config: Silence narrowing conversion warning on MSVC (diff) | |
| download | yuzu-bea6fca9a1ea2adf6950518458c5b69892e0c9a2.tar.gz yuzu-bea6fca9a1ea2adf6950518458c5b69892e0c9a2.tar.xz yuzu-bea6fca9a1ea2adf6950518458c5b69892e0c9a2.zip | |
Merge pull request #6258 from Morph1984/config-conv
yuzu: config: Silence narrowing conversion warning on MSVC
| -rw-r--r-- | src/yuzu/configuration/config.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/yuzu/configuration/config.cpp b/src/yuzu/configuration/config.cpp index d1b8c4fc9..e80a3df77 100644 --- a/src/yuzu/configuration/config.cpp +++ b/src/yuzu/configuration/config.cpp | |||
| @@ -863,8 +863,7 @@ void Config::ReadSystemValues() { | |||
| 863 | Settings::values.rng_seed.SetGlobal(rng_seed_global); | 863 | Settings::values.rng_seed.SetGlobal(rng_seed_global); |
| 864 | if (global || !rng_seed_global) { | 864 | if (global || !rng_seed_global) { |
| 865 | if (rng_seed_enabled) { | 865 | if (rng_seed_enabled) { |
| 866 | Settings::values.rng_seed.SetValue( | 866 | Settings::values.rng_seed.SetValue(ReadSetting(QStringLiteral("rng_seed"), 0).toUInt()); |
| 867 | ReadSetting(QStringLiteral("rng_seed"), 0).toULongLong()); | ||
| 868 | } else { | 867 | } else { |
| 869 | Settings::values.rng_seed.SetValue(std::nullopt); | 868 | Settings::values.rng_seed.SetValue(std::nullopt); |
| 870 | } | 869 | } |