summaryrefslogtreecommitdiffstats
path: root/src/core/frontend/emu_window.cpp
diff options
context:
space:
mode:
authorgerman <german@thesoftwareartisans.com>2021-01-10 15:36:31 +0100
committergerman <german@thesoftwareartisans.com>2021-01-15 16:05:17 +0100
commitb483f2d010bf745ab873e8f8bfaca5515e56d39f (patch)
treed14bc19b4ca1c60460a941db612195be12f16b0d /src/core/frontend/emu_window.cpp
parentAdd mutitouch support for touch screens (diff)
downloadyuzu-b483f2d010bf745ab873e8f8bfaca5515e56d39f.tar
yuzu-b483f2d010bf745ab873e8f8bfaca5515e56d39f.tar.gz
yuzu-b483f2d010bf745ab873e8f8bfaca5515e56d39f.tar.bz2
yuzu-b483f2d010bf745ab873e8f8bfaca5515e56d39f.tar.lz
yuzu-b483f2d010bf745ab873e8f8bfaca5515e56d39f.tar.xz
yuzu-b483f2d010bf745ab873e8f8bfaca5515e56d39f.tar.zst
yuzu-b483f2d010bf745ab873e8f8bfaca5515e56d39f.zip
Diffstat (limited to '')
-rw-r--r--src/core/frontend/emu_window.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/core/frontend/emu_window.cpp b/src/core/frontend/emu_window.cpp
index af6c1633a..ee7a58b1c 100644
--- a/src/core/frontend/emu_window.cpp
+++ b/src/core/frontend/emu_window.cpp
@@ -28,12 +28,11 @@ private:
public:
explicit Device(std::weak_ptr<TouchState>&& touch_state) : touch_state(touch_state) {}
Input::TouchStatus GetStatus() const override {
- Input::TouchStatus touch_status{};
if (auto state = touch_state.lock()) {
std::lock_guard guard{state->mutex};
- touch_status = state->status;
+ return state->status;
}
- return touch_status;
+ return {};
}
private: