and merge that to release branch

2010-04-14 04:01:28 +00:00 · 2010-04-14 04:01:28 +00:00 · 7b6f2fb89f
parent 30f46e4cfb
commit 7b6f2fb89f
1 changed files with 6 additions and 3 deletions
--- a/desmume/src/windows/main.cpp
+++ b/desmume/src/windows/main.cpp
@ -2718,8 +2718,11 @@ int _main()
 		if(OpenCore(cmdline.nds_file.c_str()))
 		{
 			romloaded = TRUE;
-			if(!cmdline.start_paused)
-				NDS_UnPause();
+			if(cmdline.start_paused)
+			{
+				NDS_Pause();
+				cmdline.start_paused = 0;
+			}
 		}
 	}