Index: code/menuui/readyroom.cpp
===================================================================
RCS file: /home/fs2source/cvsroot/fs2_open/code/menuui/readyroom.cpp,v
retrieving revision 2.19
diff -u -r2.19 readyroom.cpp
--- code/menuui/readyroom.cpp	18 Jul 2005 03:45:07 -0000	2.19
+++ code/menuui/readyroom.cpp	16 Sep 2005 00:18:59 -0000
@@ -1920,6 +1920,11 @@
 	// unload the overlay bitmap
 	help_overlay_unload(CAMPAIGN_ROOM_OVERLAY);
 
+	// be sure that we are going to use the correct mainhall
+	if ( (Player != NULL) && (Campaign.current_mission >= 0) ) {
+		Player->main_hall = Campaign.missions[Campaign.current_mission].main_hall;
+	}
+
 	Ui_window.destroy();
 	common_free_interface_palette();		// restore game palette
 	write_pilot_file();