franklinblanco
/
yuzu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

input_common/sdl: Correct return values within implementations of GetPollers() 

In both cases, we weren't actually returning anything, which is
undefined behavior.
This commit is contained in:
Lioncash 2019-03-18 11:32:49 -04:00
parent 874826b6dd
commit eb335f51ca
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/input_common/sdl/sdl.h
View File

@ -34,7 +34,9 @@ public:
class NullState : public State { class NullState : public State {
public: public:
Pollers GetPollers(Polling::DeviceType type) override {} Pollers GetPollers(Polling::DeviceType type) override {
return {};
}
}; };
std::unique_ptr<State> Init(); std::unique_ptr<State> Init();

4
src/input_common/sdl/sdl_impl.cpp
View File

@ -652,6 +652,7 @@ private:
SDLState::Pollers SDLState::GetPollers(InputCommon::Polling::DeviceType type) { SDLState::Pollers SDLState::GetPollers(InputCommon::Polling::DeviceType type) {
Pollers pollers; Pollers pollers;
switch (type) { switch (type) {
case InputCommon::Polling::DeviceType::Analog: case InputCommon::Polling::DeviceType::Analog:
pollers.emplace_back(std::make_unique<Polling::SDLAnalogPoller>(*this)); 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: case InputCommon::Polling::DeviceType::Button:
pollers.emplace_back(std::make_unique<Polling::SDLButtonPoller>(*this)); pollers.emplace_back(std::make_unique<Polling::SDLButtonPoller>(*this));
break; break;
return pollers;
} }
return pollers;
} }
} // namespace SDL } // namespace SDL