Fix stack overflow if SDL gamepad initialization fails

This commit is contained in:
Cameron Gutman 2018-11-18 22:04:44 -08:00
parent 115ced7ab4
commit 165ad96be1

View file

@ -137,6 +137,11 @@ ApplicationWindow {
// Doing it earlier can lead to the dialog appearing behind
// the window or otherwise without input focus.
if (!initialized) {
// Set initialized before calling anything else, because
// pumping the event loop can cause us to get another
// onAfterRendering call and potentially reenter this code.
initialized = true;
if (prefs.isRunningWayland()) {
waylandDialog.open()
}
@ -152,8 +157,6 @@ ApplicationWindow {
unmappedGamepadDialog.unmappedGamepads = unmappedGamepads
unmappedGamepadDialog.open()
}
initialized = true;
}
}