From d15e15a89740937505609ecd2b1422e5a8a1943e Mon Sep 17 00:00:00 2001
From: Zukero <kpochat@gmail.com>
Date: Mon, 21 Aug 2017 14:40:46 +0200
Subject: [PATCH] Fixed bug in feature ending a round at the end of a combat
 that caused an infinite recursion (Stack overflow) when the combat ended due
 to player death while afflicted by an actor condition.

---
 AndorsTrail/res/layout/heroinfo_inventory.xml             | 2 +-
 .../gpl/rpg/AndorsTrail/controller/CombatController.java  | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/AndorsTrail/res/layout/heroinfo_inventory.xml b/AndorsTrail/res/layout/heroinfo_inventory.xml
index 557b4b119..e9019ffba 100644
--- a/AndorsTrail/res/layout/heroinfo_inventory.xml
+++ b/AndorsTrail/res/layout/heroinfo_inventory.xml
@@ -41,7 +41,7 @@
 		android:orientation="vertical"
 		android:gravity="left"
 		>
-		<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+		<LinearLayout
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:orientation="horizontal"
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java
index ac3674114..516ced403 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java
@@ -55,9 +55,14 @@ public final class CombatController implements VisualEffectCompletedCallback {
 	public void exitCombat(boolean pickupLootBags) {
 		setCombatSelection(null, null);
 		world.model.uiSelections.isInCombat = false;
+		combatTurnListeners.onCombatEnded();
 		world.model.uiSelections.selectedPosition = null;
 		world.model.uiSelections.selectedMonster = null;
-		endOfCombatRound();
+		if (world.model.player.isDead()) {
+			controllers.gameRoundController.resetRoundTimers();
+		} else {
+			endOfCombatRound();
+		}
 		if (pickupLootBags && totalExpThisFight > 0) {
 			controllers.itemController.lootMonsterBags(killedMonsterBags, totalExpThisFight);
 		} else {
@@ -557,7 +562,6 @@ public final class CombatController implements VisualEffectCompletedCallback {
 	}
 
 	public void endOfCombatRound() {
-		combatTurnListeners.onCombatEnded();
 		world.model.worldData.tickWorldTime();
 		controllers.gameRoundController.resetRoundTimers();
 		controllers.actorStatsController.applyConditionsToPlayer(world.model.player, false);