ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Oops, we need to handle the case where the controller is undefined.

This commit is contained in:
Stephen Anthony 2017-06-18 21:59:04 -02:30
parent 0bc8a928f0
commit 881dc86ab7
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/emucore/Console.cxx
View File

@ -707,7 +707,8 @@ void Console::setControllers(const string& rommd5)
return; return;
} }
unique_ptr<Controller> leftC, rightC; unique_ptr<Controller> leftC = std::move(myLeftControl),
rightC = std::move(myRightControl);
// Also check if we should swap the paddles plugged into a jack // Also check if we should swap the paddles plugged into a jack
bool swapPaddles = myProperties.get(Controller_SwapPaddles) == "YES"; bool swapPaddles = myProperties.get(Controller_SwapPaddles) == "YES";
@ -717,8 +718,8 @@ void Console::setControllers(const string& rommd5)
{ {
// Already created in c'tor // Already created in c'tor
// We save some time by not looking at all the other types // We save some time by not looking at all the other types
leftC = myLeftControl ? std::move(myLeftControl) : if(!leftC)
make_ptr<Joystick>(Controller::Left, myEvent, *mySystem); leftC = make_ptr<Joystick>(Controller::Left, myEvent, *mySystem);
} }
else if(left == "BOOSTERGRIP") else if(left == "BOOSTERGRIP")
{ {
@ -770,8 +771,8 @@ void Console::setControllers(const string& rommd5)
{ {
// Already created in c'tor // Already created in c'tor
// We save some time by not looking at all the other types // We save some time by not looking at all the other types
rightC = myRightControl ? std::move(myRightControl) : if(!rightC)
make_ptr<Joystick>(Controller::Right, myEvent, *mySystem); rightC = make_ptr<Joystick>(Controller::Right, myEvent, *mySystem);
} }
else if(right == "BOOSTERGRIP") else if(right == "BOOSTERGRIP")
{ {