From 2bfa87668b631843d1c53ced50c1f5bcde675e47 Mon Sep 17 00:00:00 2001
From: pouillot <pouillot@30fe4595-0a0c-4342-8851-515496e4dcbd>
Date: Sun, 6 Feb 2011 18:28:36 +0000
Subject: [PATCH] Re #197 (D31 : Save and restore Quick Race) Fixed broken load
 result file (immediate return to the Raceman menu)

git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@3323 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 9fa05268836b21e2f8ddde877cab8286d499218b
Former-commit-id: 348f66873188aa8f2361252c956825ccc9534fc6
---
 src/libs/raceengineclient/racemanmenu.cpp | 9 ++++++++-
 src/libs/racescreens/fileselect.cpp       | 5 +++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/libs/raceengineclient/racemanmenu.cpp b/src/libs/raceengineclient/racemanmenu.cpp
index aef36e4f8..ab454e5d4 100644
--- a/src/libs/raceengineclient/racemanmenu.cpp
+++ b/src/libs/raceengineclient/racemanmenu.cpp
@@ -261,7 +261,6 @@ reOnLoadRaceFromFile(void *pPrevMenu)
 	const GfRaceManager* pRaceMan = ReGetRace()->getManager();
 	
 	fs.title = pRaceMan->getName();
-	fs.prevScreen = pPrevMenu;
 	fs.mode = RmFSModeLoad;
 
 	std::string strDirPath = reGetLoadFileDir();
@@ -270,11 +269,17 @@ reOnLoadRaceFromFile(void *pPrevMenu)
 	// For race types with more than 1 event (= 1 race on 1 track), load a race result file,
 	// as the previous race standings has an influence on the next race starting grid.
 	if (pRaceMan->getEventCount() > 1)
+	{
 		fs.select = reLoadRaceFromResultsFile;
+		fs.prevScreen = 0;
+	}
 	
 	// But for race types with only 1 event (= 1 race on 1 track), load a race config file.
 	else
+	{
 		fs.select = reLoadRaceFromConfigFile;
+		fs.prevScreen = pPrevMenu;
+	}
 
 	// Fire the file selection menu.
 	GfuiScreenActivate(RmFileSelect(&fs));
@@ -303,6 +308,8 @@ reOnSaveRaceToFile(void *pPrevMenu)
 static void
 reOnActivate(void * /* dummy */)
 {
+	GfLogTrace("Entering Race Manager menu\n");
+
 	// Update GUI.
 	reOnRaceDataChanged();
 }
diff --git a/src/libs/racescreens/fileselect.cpp b/src/libs/racescreens/fileselect.cpp
index 7b4b7a888..e1b174fcb 100644
--- a/src/libs/racescreens/fileselect.cpp
+++ b/src/libs/racescreens/fileselect.cpp
@@ -97,8 +97,9 @@ rmOnDeactivate(void * /* dummy */ )
 		FileList = NULL;
 	}
 
-	// Fire the return screen
-	GfuiScreenActivate(RmFs->prevScreen);
+	// Fire the return screen if any.
+	if (RmFs->prevScreen)
+		GfuiScreenActivate(RmFs->prevScreen);
 }
 
 static void