diff options
| author | 2019-03-18 11:32:49 -0400 | |
|---|---|---|
| committer | 2019-03-18 11:40:38 -0400 | |
| commit | eb335f51ca15774330219a9c65778db39cdebac1 (patch) | |
| tree | 80b2280dbfadad42b685f7e9eda7ef8bd479b689 /src/input_common/sdl/sdl_impl.cpp | |
| parent | input_common/sdl: Use a type alias to shorten declaration of GetPollers (diff) | |
| download | yuzu-eb335f51ca15774330219a9c65778db39cdebac1.tar.gz yuzu-eb335f51ca15774330219a9c65778db39cdebac1.tar.xz yuzu-eb335f51ca15774330219a9c65778db39cdebac1.zip | |
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/input_common/sdl/sdl_impl.cpp')
| -rw-r--r-- | src/input_common/sdl/sdl_impl.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/input_common/sdl/sdl_impl.cpp b/src/input_common/sdl/sdl_impl.cpp index f44a4a332..b132d77f5 100644 --- a/src/input_common/sdl/sdl_impl.cpp +++ b/src/input_common/sdl/sdl_impl.cpp | |||
| @@ -652,6 +652,7 @@ private: | |||
| 652 | 652 | ||
| 653 | SDLState::Pollers SDLState::GetPollers(InputCommon::Polling::DeviceType type) { | 653 | SDLState::Pollers SDLState::GetPollers(InputCommon::Polling::DeviceType type) { |
| 654 | Pollers pollers; | 654 | Pollers pollers; |
| 655 | |||
| 655 | switch (type) { | 656 | switch (type) { |
| 656 | case InputCommon::Polling::DeviceType::Analog: | 657 | case InputCommon::Polling::DeviceType::Analog: |
| 657 | pollers.emplace_back(std::make_unique<Polling::SDLAnalogPoller>(*this)); | 658 | pollers.emplace_back(std::make_unique<Polling::SDLAnalogPoller>(*this)); |
| @@ -659,8 +660,9 @@ SDLState::Pollers SDLState::GetPollers(InputCommon::Polling::DeviceType type) { | |||
| 659 | case InputCommon::Polling::DeviceType::Button: | 660 | case InputCommon::Polling::DeviceType::Button: |
| 660 | pollers.emplace_back(std::make_unique<Polling::SDLButtonPoller>(*this)); | 661 | pollers.emplace_back(std::make_unique<Polling::SDLButtonPoller>(*this)); |
| 661 | break; | 662 | break; |
| 662 | return pollers; | ||
| 663 | } | 663 | } |
| 664 | |||
| 665 | return pollers; | ||
| 664 | } | 666 | } |
| 665 | 667 | ||
| 666 | } // namespace SDL | 668 | } // namespace SDL |