From a6e71ab3f512a69c9dd147ba3f775e50e99c654b Mon Sep 17 00:00:00 2001
From: Simon Robertshaw <simon@hardwired.org.uk>
Date: Tue, 27 Sep 2011 14:17:36 +0100
Subject: [PATCH] Fix potential issue with argument ordering

---
 src/main.c | 53 +++++++++++++++++++++++------------------------------
 1 file changed, 23 insertions(+), 30 deletions(-)

diff --git a/src/main.c b/src/main.c
index 4abf2ef1c..ac3512ba6 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1643,6 +1643,29 @@ int main(int argc, char *argv[])
 			chdir(argv[i+1]);
 			i++;
 		}
+		else if (!strncmp(argv[i], "open", 4) && 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, signs, parts, pmap))
+				{
+					it=0;
+					svf_filename[0] = 0;
+					svf_fileopen = 1;
+				} else {
+					svf_last = NULL;
+					svf_lsize = 0;
+					free(file_data);
+					file_data = NULL;
+				}
+			}
+			i++;
+		}
 
 	}
 	
@@ -1688,40 +1711,10 @@ int main(int argc, char *argv[])
 		}
 		else if (!strncmp(argv[i], "open", 4) && 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, signs, parts, pmap))
-				{
-					it=0;
-					svf_filename[0] = 0;
-					svf_fileopen = 1;
-				} else {
-					svf_last = NULL;
-					svf_lsize = 0;
-					free(file_data);
-					file_data = NULL;
-				}
-			}
 			i++;
 		}
 		else if (!strncmp(argv[i], "ddir", 4) && i+1<argc)
 		{
-			/*char * temppath;
-			FILE *f;
-			temppath = malloc(strlen(argv[i+1])+19);
-			sprintf(temppath, "%s%s%s", argv[i+1], PATH_SEP, "powdertoydir.test")
-			f = fopen(temppath, "wb");
-			if(f){
-				chdir(argv[i+1]);
-				fclose(f);
-				remove(temppath);
-			}
-			free(temppath);*/
 			i++;
 		}