diff options
| author |  Tony Wasserka | 2015-03-14 21:08:35 +0100 |
|---|---|---|
| committer | Tony Wasserka | 2015-03-14 21:08:35 +0100 |
| commit | fdd9fed47e797b1a74f38454320ee5aca9cfb81a (patch) | |
| tree | 870f7cf85e088294388f63f544826c992d4583c0 /src/common | |
| parent | Merge pull request #642 from bunnei/touchpad (diff) | |
| parent | EmuWindow: Fixed a reference to a temporary variable (diff) | |
| download | yuzu-fdd9fed47e797b1a74f38454320ee5aca9cfb81a.tar.gz yuzu-fdd9fed47e797b1a74f38454320ee5aca9cfb81a.tar.xz yuzu-fdd9fed47e797b1a74f38454320ee5aca9cfb81a.zip | |
Merge pull request #658 from Subv/ref_temporary
EmuWindow: Fixed a reference to a temporary variable
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/emu_window.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/common/emu_window.h b/src/common/emu_window.h index 2be7517bc..c8e2de04a 100644 --- a/src/common/emu_window.h +++ b/src/common/emu_window.h | |||
| @@ -110,7 +110,7 @@ public: | |||
| 110 | * @return std::tuple of (x, y, pressed) where `x` and `y` are the touch coordinates and | 110 | * @return std::tuple of (x, y, pressed) where `x` and `y` are the touch coordinates and |
| 111 | * `pressed` is true if the touch screen is currently being pressed | 111 | * `pressed` is true if the touch screen is currently being pressed |
| 112 | */ | 112 | */ |
| 113 | const std::tuple<u16, u16, bool>& GetTouchState() const { | 113 | const std::tuple<u16, u16, bool> GetTouchState() const { |
| 114 | return std::make_tuple(touch_x, touch_y, touch_pressed); | 114 | return std::make_tuple(touch_x, touch_y, touch_pressed); |
| 115 | } | 115 | } |
| 116 | 116 | ||