Michał W. Urbańczyk 12 years ago
parent
commit
d5263d75f8
1 changed files with 3 additions and 0 deletions
  1. 3 0
      client/CPlayerInterface.cpp

+ 3 - 0
client/CPlayerInterface.cpp

@@ -810,6 +810,9 @@ void CPlayerInterface::battleEnd(const BattleResult *br)
 			SDL_Rect temp_rect = genRect(561, 470, (screen->w - 800)/2 + 165, (screen->h - 600)/2 + 19);
 			auto   resWindow = new CBattleResultWindow(*br, temp_rect, *this);
 			GH.pushInt(resWindow);
+			// #1490 - during AI turn when quick combat is on, we need to display the message and wait for user to close it.
+			// Otherwise NewTurn causes freeze.
+			waitWhileDialog();
 			return;
 		}
 	}