Ensuring guiScreen is updated before guiSelectedRowChanged can fire

Author: phkb

src/Core/Entities/PlayerEntity.m

@@ -8876,7 +8876,9 @@ - (void) setGuiToGameOptionsScreen
 
 	[[UNIVERSE gameView] clearMouse];
 	[[UNIVERSE gameController] setMouseInteractionModeForUIWithMouseInteraction:YES];
-	
+
+	gui_screen = GUI_SCREEN_GAMEOPTIONS;
+
 	// GUI stuff
 	{
 		#define OO_SETACCESSCONDITIONFORROW(condition, row)				\
@@ -9139,7 +9141,6 @@ - (void) setGuiToGameOptionsScreen
 	/* ends */
 
 	[self setShowDemoShips:NO];
-	gui_screen = GUI_SCREEN_GAMEOPTIONS;
 
 	[self setShowDemoShips:NO];
 	[UNIVERSE enterGUIViewModeWithMouseInteraction:YES];
@@ -9155,6 +9156,8 @@ - (void) setGuiToLoadSaveScreen
 
 	[[UNIVERSE gameController] setMouseInteractionModeForUIWithMouseInteraction:YES];
 
+	gui_screen = GUI_SCREEN_OPTIONS;
+
 	if ([self status] == STATUS_DOCKED)
 	{
 		if ([self dockedStation] == nil)  [self setDockedAtMainStation];
@@ -9232,7 +9235,6 @@ - (void) setGuiToLoadSaveScreen
 	[[UNIVERSE gameView] clearMouse];
 
 	[self setShowDemoShips:NO];
-	gui_screen = GUI_SCREEN_OPTIONS;
 
 	[UNIVERSE enterGUIViewModeWithMouseInteraction:YES];
 
@@ -9439,6 +9441,8 @@ - (void) setGuiToEquipShipScreen:(int)skipParam selectingFacingFor:(NSString *)e
 		BOOL			weaponMounted = NO;
 		BOOL			guiChanged = (gui_screen != GUI_SCREEN_EQUIP_SHIP);
 
+		gui_screen = GUI_SCREEN_EQUIP_SHIP;
+
 		[gui clearAndKeepBackground:!guiChanged];
 		[gui setTitle:DESC(@"equip-title")];
 
@@ -9685,7 +9689,6 @@ - (void) setGuiToEquipShipScreen:(int)skipParam selectingFacingFor:(NSString *)e
 
 	chosen_weapon_facing = WEAPON_FACING_NONE;
 	[self setShowDemoShips:NO];
-	gui_screen = GUI_SCREEN_EQUIP_SHIP;
 
 	[self setShowDemoShips:NO];
 	[UNIVERSE enterGUIViewModeWithMouseInteraction:YES];
@@ -9752,7 +9755,9 @@ - (void) setGuiToInterfacesScreen:(int)skip
 	NSDictionary *interfaces = [[self dockedStation] localInterfaces];
 	NSArray		*interfaceKeys = [interfaces keysSortedByValueUsingSelector:@selector(interfaceCompare:)]; // sorts by category, then title
 	int i;
-	
+
+	OOGUIScreenID	oldScreen = gui_screen;
+
 	// GUI stuff
 	{
 		GuiDisplayGen	*gui = [UNIVERSE gui];
@@ -9763,6 +9768,8 @@ - (void) setGuiToInterfacesScreen:(int)skip
 		[gui clearAndKeepBackground:!guiChanged];
 		[gui setTitle:DESC(@"interfaces-title")];
 
+		gui_screen = GUI_SCREEN_INTERFACES;
+
 
 		OOGUITabSettings tab_stops;
 		tab_stops[0] = 0;
@@ -9856,8 +9863,6 @@ - (void) setGuiToInterfacesScreen:(int)skip
 
 	[self setShowDemoShips:NO];
 
-	OOGUIScreenID	oldScreen = gui_screen;
-	gui_screen = GUI_SCREEN_INTERFACES;
 	[self noteGUIDidChangeFrom:oldScreen to:gui_screen];
 
 	[self setShowDemoShips:NO];

src/Core/Entities/PlayerEntityLoadSave.m

@@ -259,11 +259,11 @@ - (void) setGuiToScenarioScreen:(int)page
 			++row;
 		}
 
+		gui_screen = GUI_SCREEN_NEWGAME;
+
 		[gui setSelectableRange:NSMakeRange(start_row - 2,3 + row - start_row)];
 		[gui setSelectedRow:start_row];
 		[self showScenarioDetails];
-
-		gui_screen = GUI_SCREEN_NEWGAME;
 
 		if (guiChanged)
 		{