diff options
| -rwxr-xr-x | .ci/scripts/windows/docker.sh | 11 | ||||
| -rw-r--r-- | src/core/core.cpp | 5 | ||||
| -rw-r--r-- | src/core/hle/kernel/k_resource_limit.cpp | 1 |
3 files changed, 10 insertions, 7 deletions
diff --git a/.ci/scripts/windows/docker.sh b/.ci/scripts/windows/docker.sh index feba3fd6e..155d8a5c8 100755 --- a/.ci/scripts/windows/docker.sh +++ b/.ci/scripts/windows/docker.sh | |||
| @@ -18,19 +18,20 @@ cd .. | |||
| 18 | mkdir package | 18 | mkdir package |
| 19 | 19 | ||
| 20 | if [ -d "/usr/x86_64-w64-mingw32/lib/qt5/plugins/platforms/" ]; then | 20 | if [ -d "/usr/x86_64-w64-mingw32/lib/qt5/plugins/platforms/" ]; then |
| 21 | QT_PLATFORM_DLL_PATH='/usr/x86_64-w64-mingw32/lib/qt5/plugins/platforms/' | 21 | QT_PLUGINS_PATH='/usr/x86_64-w64-mingw32/lib/qt5/plugins' |
| 22 | else | 22 | else |
| 23 | #fallback to qt | 23 | #fallback to qt |
| 24 | QT_PLATFORM_DLL_PATH='/usr/x86_64-w64-mingw32/lib/qt/plugins/platforms/' | 24 | QT_PLUGINS_PATH='/usr/x86_64-w64-mingw32/lib/qt/plugins' |
| 25 | fi | 25 | fi |
| 26 | 26 | ||
| 27 | find build/ -name "yuzu*.exe" -exec cp {} 'package' \; | 27 | find build/ -name "yuzu*.exe" -exec cp {} 'package' \; |
| 28 | 28 | ||
| 29 | # copy Qt plugins | 29 | # copy Qt plugins |
| 30 | mkdir package/platforms | 30 | mkdir package/platforms |
| 31 | cp "${QT_PLATFORM_DLL_PATH}/qwindows.dll" package/platforms/ | 31 | cp -v "${QT_PLUGINS_PATH}/platforms/qwindows.dll" package/platforms/ |
| 32 | cp -rv "${QT_PLATFORM_DLL_PATH}/../mediaservice/" package/ | 32 | cp -rv "${QT_PLUGINS_PATH}/mediaservice/" package/ |
| 33 | cp -rv "${QT_PLATFORM_DLL_PATH}/../imageformats/" package/ | 33 | cp -rv "${QT_PLUGINS_PATH}/imageformats/" package/ |
| 34 | cp -rv "${QT_PLUGINS_PATH}/styles/" package/ | ||
| 34 | rm -f package/mediaservice/*d.dll | 35 | rm -f package/mediaservice/*d.dll |
| 35 | 36 | ||
| 36 | for i in package/*.exe; do | 37 | for i in package/*.exe; do |
diff --git a/src/core/core.cpp b/src/core/core.cpp index c5004b7b4..e6f1aa0e7 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp | |||
| @@ -3,6 +3,7 @@ | |||
| 3 | // Refer to the license.txt file included. | 3 | // Refer to the license.txt file included. |
| 4 | 4 | ||
| 5 | #include <array> | 5 | #include <array> |
| 6 | #include <atomic> | ||
| 6 | #include <memory> | 7 | #include <memory> |
| 7 | #include <utility> | 8 | #include <utility> |
| 8 | 9 | ||
| @@ -377,7 +378,7 @@ struct System::Impl { | |||
| 377 | std::unique_ptr<Core::DeviceMemory> device_memory; | 378 | std::unique_ptr<Core::DeviceMemory> device_memory; |
| 378 | Core::Memory::Memory memory; | 379 | Core::Memory::Memory memory; |
| 379 | CpuManager cpu_manager; | 380 | CpuManager cpu_manager; |
| 380 | bool is_powered_on = false; | 381 | std::atomic_bool is_powered_on{}; |
| 381 | bool exit_lock = false; | 382 | bool exit_lock = false; |
| 382 | 383 | ||
| 383 | Reporter reporter; | 384 | Reporter reporter; |
| @@ -463,7 +464,7 @@ System::ResultStatus System::Load(Frontend::EmuWindow& emu_window, const std::st | |||
| 463 | } | 464 | } |
| 464 | 465 | ||
| 465 | bool System::IsPoweredOn() const { | 466 | bool System::IsPoweredOn() const { |
| 466 | return impl->is_powered_on; | 467 | return impl->is_powered_on.load(std::memory_order::relaxed); |
| 467 | } | 468 | } |
| 468 | 469 | ||
| 469 | void System::PrepareReschedule() { | 470 | void System::PrepareReschedule() { |
diff --git a/src/core/hle/kernel/k_resource_limit.cpp b/src/core/hle/kernel/k_resource_limit.cpp index da88f35bc..0c4bba66b 100644 --- a/src/core/hle/kernel/k_resource_limit.cpp +++ b/src/core/hle/kernel/k_resource_limit.cpp | |||
| @@ -79,6 +79,7 @@ ResultCode KResourceLimit::SetLimitValue(LimitableResource which, s64 value) { | |||
| 79 | R_UNLESS(current_values[index] <= value, ResultInvalidState); | 79 | R_UNLESS(current_values[index] <= value, ResultInvalidState); |
| 80 | 80 | ||
| 81 | limit_values[index] = value; | 81 | limit_values[index] = value; |
| 82 | peak_values[index] = current_values[index]; | ||
| 82 | 83 | ||
| 83 | return ResultSuccess; | 84 | return ResultSuccess; |
| 84 | } | 85 | } |