diff options
| author | Lioncash <mathew1800@gmail.com> | 2019-03-18 11:32:49 -0400 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2019-03-18 11:40:38 -0400 |
| commit | eb335f51ca15774330219a9c65778db39cdebac1 (patch) | |
| tree | 80b2280dbfadad42b685f7e9eda7ef8bd479b689 /src | |
| parent | 874826b6ddef20f190013f24021d20e0338d5593 (diff) | |
input_common/sdl: Correct return values within implementations of GetPollers()
In both cases, we weren't actually returning anything, which is
undefined behavior.
Diffstat (limited to 'src')
| -rw-r--r-- | src/input_common/sdl/sdl.h | 4 | ||||
| -rw-r--r-- | src/input_common/sdl/sdl_impl.cpp | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/input_common/sdl/sdl.h b/src/input_common/sdl/sdl.h index 940ca7f1ba..d7f24c68a7 100644 --- a/src/input_common/sdl/sdl.h +++ b/src/input_common/sdl/sdl.h @@ -34,7 +34,9 @@ public: class NullState : public State { public: - Pollers GetPollers(Polling::DeviceType type) override {} + Pollers GetPollers(Polling::DeviceType type) override { + return {}; + } }; std::unique_ptr<State> Init(); diff --git a/src/input_common/sdl/sdl_impl.cpp b/src/input_common/sdl/sdl_impl.cpp index f44a4a3321..b132d77f5d 100644 --- a/src/input_common/sdl/sdl_impl.cpp +++ b/src/input_common/sdl/sdl_impl.cpp @@ -652,6 +652,7 @@ private: SDLState::Pollers SDLState::GetPollers(InputCommon::Polling::DeviceType type) { Pollers pollers; + switch (type) { case InputCommon::Polling::DeviceType::Analog: pollers.emplace_back(std::make_unique<Polling::SDLAnalogPoller>(*this)); @@ -659,8 +660,9 @@ SDLState::Pollers SDLState::GetPollers(InputCommon::Polling::DeviceType type) { case InputCommon::Polling::DeviceType::Button: pollers.emplace_back(std::make_unique<Polling::SDLButtonPoller>(*this)); break; - return pollers; } + + return pollers; } } // namespace SDL |