From 78ec0b94933abc264121895ecd23fe6efaf9ea63 Mon Sep 17 00:00:00 2001
From: ehouse <ehouse@0782aaa5-4710-0410-8820-a96bf9123855>
Date: Sun, 30 Nov 2003 18:55:29 +0000
Subject: [PATCH] post prefsChangedEvent before newGameOkEvent

---
 xwords4/palm/newgame.c | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/xwords4/palm/newgame.c b/xwords4/palm/newgame.c
index d54a0a3ae..7179b45c6 100644
--- a/xwords4/palm/newgame.c
+++ b/xwords4/palm/newgame.c
@@ -276,9 +276,16 @@ newGameHandleEvent( EventPtr event )
 
             /* if we put up the prefs form from within this one and the user
                clicked ok, we need to make sure the main form gets the
-               notification so it can make use of any changes. */
-            if ( globals->isNewGame ) {
+               notification so it can make use of any changes.  This event
+               needs to arrive before the newGame event so any changes will
+               be incorporated. */
+            if ( state->forwardChange ) {
+                eventToPost.eType = prefsChangedEvent;
+                EvtAddEventToQueue( &eventToPost );
+                state->forwardChange = false;
+            }
 
+            if ( globals->isNewGame ) {
                 updatePlayerInfo( globals );
 
                 eventToPost.eType = newGameOkEvent;
@@ -290,12 +297,6 @@ newGameHandleEvent( EventPtr event )
                 updatePlayerInfo( globals );
             }
 
-            if ( state->forwardChange ) {
-                eventToPost.eType = prefsChangedEvent;
-                EvtAddEventToQueue( &eventToPost );
-                state->forwardChange = false;
-            }
-
             unloadNewGameState( globals );
 
             FrmReturnToForm( 0 );