From 2b53c30a6b9ac3c0f4d6ba6ea1b8575496f96317 Mon Sep 17 00:00:00 2001
From: c_anthon <c_anthon>
Date: Wed, 7 Oct 2009 19:17:46 +0000
Subject: [PATCH] protect movelist during autosave

---
 ChangeLog  |    4 ++++
 analysis.c |   35 ++++++++++++++++++++---------------
 2 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1540ae8..a5da10c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Oct  7 21:17:04 CEST 2009 Christian Anthon <address@hidden>
+
+	* analysis.c: protect movelist during autosave
+
 Tue Oct  2 04:32:27 MDT 2009 Michael Petch <address@hidden>
 
 	* progress.c: Fix assert/crash when doing a single rollout 
diff --git a/analysis.c b/analysis.c
index de4f063..32b8e8a 100644
--- a/analysis.c
+++ b/analysis.c
@@ -16,7 +16,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id: analysis.c,v 1.220 2009/10/01 21:05:53 c_anthon Exp $
+ * $Id: analysis.c,v 1.221 2009/10/07 19:17:46 c_anthon Exp $
  */
 
 #include "config.h"
@@ -723,24 +723,29 @@ AnalyzeMove (moverecord *pmr, matchstate *pms, const listOLD *plParentGame,
 			ApplyMove( anBoardMove, pmr->n.anMove, FALSE );
 			PositionKey ( (ConstTanBoard)anBoardMove, auch );
 		  
-				if ( cmp_evalsetup ( pesChequer,
-									&pmr->esChequer ) > 0 ) {
+			if (cmp_evalsetup(pesChequer, &pmr->esChequer) > 0) {
+
+				if (pmr->ml.cMoves)
+					free(pmr->ml.amMoves);
 
-				if( pmr->ml.cMoves )
-					free( pmr->ml.amMoves );
-		  
 				/* find best moves */
-		  
-				MT_Release();
-				if( FindnSaveBestMoves ( &(pmr->ml), pmr->anDice[ 0 ],
-										pmr->anDice[ 1 ],
-										(ConstTanBoard)pms->anBoard, auch, 
-										arSkillLevel[ SKILL_DOUBTFUL ],
-										&ci, &pesChequer->ec, aamf ) < 0 )
-						return -1;
-				MT_Exclusive();
 
+				{
+					movelist ml;
+					MT_Release();
+					if (FindnSaveBestMoves(&ml, pmr->anDice[0],
+								pmr->anDice[1],
+								(ConstTanBoard) pms->anBoard, auch,
+								arSkillLevel[SKILL_DOUBTFUL],
+								&ci, &pesChequer->ec, aamf) < 0)
+						return -1;
+					MT_Exclusive();
+					CopyMoveList(&ml, &pmr->ml);
+					if (ml.cMoves)
+						free(ml.amMoves);
 				}
+
+			}
 		  
 			for( pmr->n.iMove = 0; pmr->n.iMove < pmr->ml.cMoves;
 			pmr->n.iMove++ )
-- 
1.5.5.6