--- a/openttd.c	Wed Nov 23 21:47:01 2005 +0000
+++ b/openttd.c	Sat Nov 26 12:45:53 2005 +0000
@@ -778,7 +778,6 @@
 	case SM_LOAD: { /* Load game, Play Scenario */
 		_opt_ptr = &_opt;
 
-		_error_message = INVALID_STRING_ID;
 		if (!SafeSaveOrLoad(_file_to_saveload.name, _file_to_saveload.mode, GM_NORMAL)) {
 			LoadIntroGame();
 			ShowErrorMessage(_error_message, STR_4009_GAME_LOAD_FAILED, 0, 0);

--- a/screenshot.c	Wed Nov 23 21:47:01 2005 +0000
+++ b/screenshot.c	Sat Nov 26 12:45:53 2005 +0000
@@ -483,7 +483,7 @@
 	char *base;
 	int serial;
 
-	if (_game_mode == GM_EDITOR || _local_player == OWNER_SPECTATOR) {
+	if (_game_mode == GM_EDITOR || _game_mode == GM_MENU || _local_player == OWNER_SPECTATOR) {
 		sprintf(_screenshot_name, "screenshot");
 	} else {
 		const Player* p = GetPlayer(_local_player);