From 0e122bd78678cf0778e3bf350f0a210f04570523 Mon Sep 17 00:00:00 2001
From: Kevin Anthoney <kevin@kanthoney.co.uk>
Date: Sat, 19 Jul 2014 16:55:03 +0100
Subject: [PATCH] only clear chart screen when switching screens and switch off
 pause key for text entry

---
 src/Core/Entities/PlayerEntity.m         | 3 +--
 src/Core/Entities/PlayerEntityControls.m | 5 +++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Core/Entities/PlayerEntity.m b/src/Core/Entities/PlayerEntity.m
index 45587295..9d21bcc3 100644
--- a/src/Core/Entities/PlayerEntity.m
+++ b/src/Core/Entities/PlayerEntity.m
@@ -7574,7 +7574,7 @@ static GLfloat		sBaseMass = 0.0;
 	
 	// GUI stuff
 	{
-		[gui clearAndKeepBackground:!guiChanged];
+		//[gui clearAndKeepBackground:!guiChanged];
 		NSString *gal_key = [NSString stringWithFormat:@"long-range-chart-title-%d", galaxy_number];
 		if ([[UNIVERSE descriptions] valueForKey:gal_key] == nil)
 		{
@@ -7600,7 +7600,6 @@ static GLfloat		sBaseMass = 0.0;
 		}
 		else
 		{
-			[gui setText: @"Test" forRow: GUI_ROW_CHART_SYSTEM+1];
 			[gui setShowTextCursor:NO];
 		}
 	}
diff --git a/src/Core/Entities/PlayerEntityControls.m b/src/Core/Entities/PlayerEntityControls.m
index 0432fa76..9c4b356a 100644
--- a/src/Core/Entities/PlayerEntityControls.m
+++ b/src/Core/Entities/PlayerEntityControls.m
@@ -3274,6 +3274,7 @@ static NSTimeInterval	time_last_frame;
 					chart_mode = CHART_MODE_LONG_RANGE;
 				}
 			}
+			[gui clearAndKeepBackground: NO];
 			[self setGuiToShortRangeChartScreen];
 		}
 	}
@@ -3430,7 +3431,7 @@ static BOOL autopilot_pause;
 			toggling_music = NO;
 		}
 		// look for the pause game, 'p' key
-		if ([gameView isDown:key_pausebutton] && gui_screen != GUI_SCREEN_LONG_RANGE_CHART && gui_screen != GUI_SCREEN_MISSION)
+		if ([gameView isDown:key_pausebutton] && !(gui_screen == GUI_SCREEN_SHORT_RANGE_CHART && chart_mode == CHART_MODE_LONG_RANGE) && gui_screen != GUI_SCREEN_MISSION)
 		{
 			if (!autopilot_pause)
 			{
@@ -3478,7 +3479,7 @@ static BOOL autopilot_pause;
 	{
 		// Pause game, 'p' key
 		exceptionContext = @"pause key";
-		if ([gameView isDown:key_pausebutton] && (gui_screen != GUI_SCREEN_LONG_RANGE_CHART &&
+		if ([gameView isDown:key_pausebutton] && (!(gui_screen == GUI_SCREEN_SHORT_RANGE_CHART && chart_mode == CHART_MODE_LONG_RANGE) &&
 				gui_screen != GUI_SCREEN_MISSION && gui_screen != GUI_SCREEN_REPORT &&
 				gui_screen != GUI_SCREEN_SAVE) )
 		{