zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-13 07:57:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

- In UpdateJoystickConfigMenu(), do not access joy before checking if it's NULL.

Browse source 
SVN r4019 (trunk)
This commit is contained in:
Randy Heit 2013-01-03 03:12:07 +00:00
parent 424fcb4cba
commit 22e52776e3
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/menu/joystickmenu.cpp
View file

@ -280,15 +280,16 @@ FOptionMenuDescriptor *UpdateJoystickConfigMenu(IJoystickConfig *joy)
delete opt->mItems[i]; delete opt->mItems[i];
opt->mItems.Clear(); opt->mItems.Clear();
} }
opt->mTitle.Format("Configure %s", joy->GetName().GetChars());
if (joy == NULL) if (joy == NULL)
{ {
opt->mTitle = "Configure Controller";
it = new FOptionMenuItemStaticText("Invalid controller specified for menu", false); it = new FOptionMenuItemStaticText("Invalid controller specified for menu", false);
opt->mItems.Push(it); opt->mItems.Push(it);
} }
else else
{ {
opt->mTitle.Format("Configure %s", joy->GetName().GetChars());
SELECTED_JOYSTICK = joy; SELECTED_JOYSTICK = joy;
it = new FOptionMenuSliderJoySensitivity("Overall sensitivity", 0, 2, 0.1, 3); it = new FOptionMenuSliderJoySensitivity("Overall sensitivity", 0, 2, 0.1, 3);