- manifest['foo'] is now case insensitive:manifest['food'] = manifest['Food'] = manifest['FOOD']

- corrected a last-minute snafu with mission screen callbacks & status screen. Should stop doing this when sleepy!

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2761 127b21dd-08f5-0310-b4b7-95ae10353056

src/Core/Entities/PlayerEntityControls.m

@@ -3084,13 +3084,21 @@ static BOOL toggling_music;
 						[UNIVERSE removeDemoShips];
 						[gui clearBackground];
 						[[OOMusicController sharedController] stopMissionMusic];
-						[self setGuiToStatusScreen];	// some js actions require this to be set first.
 						if (_missionWithCallback)
 						{
 							[self doMissionCallback];
 						}
-						[self setGuiToStatusScreen];	// we need to provide feedback when something changes inside the callback.
-						[self endMissionScreenAndNoteOpportunity];
+						// fix for launching from inside the callback.
+						if ([self status] == STATUS_DOCKED) 
+						{
+							[self setGuiToStatusScreen];	// enable feedback
+							[self endMissionScreenAndNoteOpportunity];
+						}
+						else
+						{
+							[self doWorldEventUntilMissionScreen:@"missionScreenEnded"];
+						}
+						
 					}
 					spacePressed = YES;
 				}
@@ -3142,13 +3150,20 @@ static BOOL toggling_music;
 						[gui clearBackground];
 						[[OOMusicController sharedController] stopMissionMusic];
 						[self playDismissedMissionScreen];
-						[self setGuiToStatusScreen];	// enable some js commands
 						if (_missionWithCallback)
 						{
 							[self doMissionCallback];
 						}
-						[self setGuiToStatusScreen];	// enable feedback
-						[self endMissionScreenAndNoteOpportunity];
+						// fix for launching from inside the callback
+						if ([self status] == STATUS_DOCKED) 
+						{
+							[self setGuiToStatusScreen];	// enable feedback
+							[self endMissionScreenAndNoteOpportunity];
+						}
+						else
+						{
+							[self doWorldEventUntilMissionScreen:@"missionScreenEnded"];
+						}
 						[self checkScript];
 					}
 					selectPressed = YES;