From 8dcccbc4fce604664fd353101bbc2b669b1f83cb Mon Sep 17 00:00:00 2001
From: jacksonmj <mj-pt@jacksonmj.co.uk>
Date: Fri, 1 Jun 2012 19:28:06 +0100
Subject: [PATCH] Fix command line save opening (save was being cleared
 immediately after loading)

---
 src/main.c | 44 ++++++++++++++++++++------------------------
 1 file changed, 20 insertions(+), 24 deletions(-)

diff --git a/src/main.c b/src/main.c
index bd15e8c4b..a21f11a1a 100644
--- a/src/main.c
+++ b/src/main.c
@@ -823,30 +823,6 @@ int main(int argc, char *argv[])
 			chdir(argv[i+1]);
 			i++;
 		}
-		else if (!strncmp(argv[i], "open", 5) && i+1<argc)
-		{
-			int size;
-			void *file_data;
-			file_data = file_load(argv[i+1], &size);
-			if (file_data)
-			{
-				svf_last = file_data;
-				svf_lsize = size;
-				if(!parse_save(file_data, size, 1, 0, 0, bmap, fvx, fvy, vx, vy, pv, signs, parts, pmap))
-				{
-					it=0;
-					svf_filename[0] = 0;
-					svf_fileopen = 1;
-				} else {
-					saveOpenError = 1;
-					svf_last = NULL;
-					svf_lsize = 0;
-					free(file_data);
-					file_data = NULL;
-				}
-			}
-			i++;
-		}
 		else if (!strncmp(argv[i], "ptsave", 7) && i+1<argc)
 		{
 			//Prevent reading of any arguments after ptsave for security
@@ -899,6 +875,26 @@ int main(int argc, char *argv[])
 		}
 		else if (!strncmp(argv[i], "open", 5) && i+1<argc)
 		{
+			int size;
+			void *file_data;
+			file_data = file_load(argv[i+1], &size);
+			if (file_data)
+			{
+				svf_last = file_data;
+				svf_lsize = size;
+				if(!parse_save(file_data, size, 1, 0, 0, bmap, fvx, fvy, vx, vy, pv, signs, parts, pmap))
+				{
+					it=0;
+					svf_filename[0] = 0;
+					svf_fileopen = 1;
+				} else {
+					saveOpenError = 1;
+					svf_last = NULL;
+					svf_lsize = 0;
+					free(file_data);
+					file_data = NULL;
+				}
+			}
 			i++;
 		}
 		else if (!strncmp(argv[i], "ddir", 5) && i+1<argc)