From 9e1afaddd2059fa8aea418357eb3de6b4085c0bf Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 1 Sep 2014 20:20:03 +0300 Subject: Fix crash in text fields if using context menu before connected to game. --- src/gui/widgets/textfield.cpp | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/src/gui/widgets/textfield.cpp b/src/gui/widgets/textfield.cpp index e47f1905f..a20b05e1e 100644 --- a/src/gui/widgets/textfield.cpp +++ b/src/gui/widgets/textfield.cpp @@ -707,9 +707,19 @@ void TextField::mousePressed(MouseEvent &event) { if (popupMenu) { - popupMenu->showTextFieldPopup(viewport->mMouseX, - viewport->mMouseY, - this); + if (viewport) + { + popupMenu->showTextFieldPopup(viewport->mMouseX, + viewport->mMouseY, + this); + } + else + { + int mouseX = 0; + int mouseY = 0; + Gui::getMouseState(&mouseX, &mouseY); + popupMenu->showTextFieldPopup(mouseX, mouseY, this); + } } } else if (event.getButton() == MouseButton::LEFT) -- cgit v1.2.3-70-g09d2