OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- made DMenu's static variables regular global variables because that class is going to go completely scripted soon.

Browse source
This commit is contained in:
Christoph Oelckers 2017-02-18 19:19:14 +01:00
commit 06141338f1
9 changed files with 74 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/menu/joystickmenu.cpp
View file

@ -189,9 +189,9 @@ void UpdateJoystickMenu(IJoystickConfig *selected)
//opt->CalcIndent();
// If the joystick config menu is open, close it if the device it's open for is gone.
if (DMenu::CurrentMenu != nullptr && (DMenu::CurrentMenu->IsKindOf("JoystickConfigMenu")))
if (CurrentMenu != nullptr && (CurrentMenu->IsKindOf("JoystickConfigMenu")))
{
auto p = DMenu::CurrentMenu->PointerVar<IJoystickConfig>("mJoy");
auto p = CurrentMenu->PointerVar<IJoystickConfig>("mJoy");
if (p != nullptr)
{
unsigned i;
@ -204,7 +204,7 @@ void UpdateJoystickMenu(IJoystickConfig *selected)
}
if (i == Joysticks.Size())
{
DMenu::CurrentMenu->Close();
CurrentMenu->Close();
}
}
}