Pārlūkot izejas kodu

Merge pull request #683 from vlad-yakovlev/fix-map-select-crahs

[3167] Crash when click single scenario in new game
Alexander Shishkin 4 gadi atpakaļ
vecāks
revīzija
5e707eee0f
1 mainītis faili ar 5 papildinājumiem un 4 dzēšanām
  1. 5 4
      client/widgets/TextControls.cpp

+ 5 - 4
client/widgets/TextControls.cpp

@@ -656,19 +656,20 @@ CFocusable::~CFocusable()
 
 
 	focusables -= this;
 	focusables -= this;
 }
 }
+
 void CFocusable::giveFocus()
 void CFocusable::giveFocus()
 {
 {
+	focus = true;
+	focusGot();
+	redraw();
+
 	if(inputWithFocus)
 	if(inputWithFocus)
 	{
 	{
 		inputWithFocus->focus = false;
 		inputWithFocus->focus = false;
-		inputWithFocus->focusLost();
 		inputWithFocus->redraw();
 		inputWithFocus->redraw();
 	}
 	}
 
 
-	focus = true;
 	inputWithFocus = this;
 	inputWithFocus = this;
-	focusGot();
-	redraw();
 }
 }
 
 
 void CFocusable::moveFocus()
 void CFocusable::moveFocus()