empathicqubit/AppleWin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Avoid using uninitialised data.

Browse source 
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
This commit is contained in:
Andrea Odetti 2017-10-10 14:27:07 +01:00
parent 3733da1af7
commit 3231f86f87
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
source/frontends/qapple/preferences.cpp
View file

@ -190,13 +190,17 @@ Preferences::Data Preferences::getData() const
data.mouseInSlot4 = mouse_4->isChecked();
data.cpmInSlot5 = cpm_5->isChecked();
data.hdInSlot7 = hd_7->isChecked();
data.joystick = joystick->currentText();
if (joystick->currentIndex() >= 1)
{
const QVariant & device = joystick->itemData(joystick->currentIndex());
data.joystick = joystick->currentText();
data.joystickId = device.toInt();
}
else
{
data.joystickId = 0;
}
return data;
}

4
source/frontends/qapple/qapple.cpp
View file

@ -317,6 +317,10 @@ void QApple::on_actionOptions_triggered()
currentOptions.joystick = myGamepad->name();
currentOptions.joystickId = myGamepad->deviceId();
}
else
{
currentOptions.joystickId = 0;
}
QSettings settings; // the function will "modify" it
myPreferences.setup(currentOptions, settings);