Fix possible null current screen in overworld

Benau · Benau · commit 5e2f75a0781a · 2019-07-06T01:40:05.000+08:00
diff --git a/src/guiengine/event_handler.cpp b/src/guiengine/event_handler.cpp
@@ -852,7 +852,9 @@ EventPropagation EventHandler::onGUIEvent(const SEvent& event)
                 if (w == NULL) break;
                 if (!w->isActivated())
                 {
-                    GUIEngine::getCurrentScreen()->onDisabledItemClicked(w->m_properties[PROP_ID].c_str());
+                    // Some dialog in overworld could have deactivated widget, and no current screen in overworld
+                    if (GUIEngine::getCurrentScreen())
+                        GUIEngine::getCurrentScreen()->onDisabledItemClicked(w->m_properties[PROP_ID].c_str());
                     return EVENT_BLOCK;
                 }
 

Original file line number	Diff line number	Diff line change
`@@ -852,7 +852,9 @@ EventPropagation EventHandler::onGUIEvent(const SEvent& event)`
`852`	`852`	`if (w == NULL) break;`
`853`	`853`	`if (!w->isActivated())`
`854`	`854`	`{`
`855`		`- GUIEngine::getCurrentScreen()->onDisabledItemClicked(w->m_properties[PROP_ID].c_str());`
	`855`	`+ // Some dialog in overworld could have deactivated widget, and no current screen in overworld`
	`856`	`+ if (GUIEngine::getCurrentScreen())`
	`857`	`+ GUIEngine::getCurrentScreen()->onDisabledItemClicked(w->m_properties[PROP_ID].c_str());`
`856`	`858`	`return EVENT_BLOCK;`
`857`	`859`	`}`
`858`	`860`