# HG changeset patch
# User Darkvater <Darkvater@openttd.org>
# Date 1172589426 0
# Node ID 906b244bce944d1b0840a05f366af3a56a84b259
# Parent  d7bcc0708818b9517b9f1f09b2823e2083d8502c
(svn r8914) -Regression (UTF8): Win9x is very picky about trailing slashes in paths, so C:\\* will not work (but C:\Windows\\* does; go figure). Thanks glx for pointing it out and for the initial fix.

diff --git a/src/newgrf_gui.cpp b/src/newgrf_gui.cpp
--- a/src/newgrf_gui.cpp
+++ b/src/newgrf_gui.cpp
@@ -485,6 +485,9 @@
 			break;
 
 		case WE_DESTROY:
+			if (!WP(w, newgrf_d).execute) {
+				CopyGRFConfigList(WP(w, newgrf_d).orig_list, *WP(w, newgrf_d).list);
+			}
 			/* Remove the temporary copy of grf-list used in window */
 			ClearGRFConfigList(WP(w, newgrf_d).list);
 			break;
diff --git a/src/saveload.cpp b/src/saveload.cpp
--- a/src/saveload.cpp
+++ b/src/saveload.cpp
@@ -1593,13 +1593,8 @@
 			/* No loader found, treat as version 0 and use LZO format */
 			if (fmt == endof(_saveload_formats)) {
 				DEBUG(sl, 0, "Unknown savegame type, trying to load it as the buggy format");
-#if defined(WINCE)
-				/* Of course some system had not to support rewind ;) */
-				fseek(_sl.fh, 0L, SEEK_SET);
-				clearerr(_sl.fh);
-#else
+
 				rewind(_sl.fh);
-#endif
 				_sl_version = 0;
 				_sl_minor_version = 0;
 				fmt = _saveload_formats + 1; // LZO