From 7b6f2fb89f4ffa0e3afa00ff0ab0450d81b709bb Mon Sep 17 00:00:00 2001
From: zeromus <zeromus@users.sf.net>
Date: Wed, 14 Apr 2010 04:01:28 +0000
Subject: [PATCH] and merge that to release branch

---
 desmume/src/windows/main.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/desmume/src/windows/main.cpp b/desmume/src/windows/main.cpp
index 5b536c6a8..fa8e17570 100644
--- 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;
+			}
 		}
 	}
 
@@ -3133,7 +3136,7 @@ static BOOL OpenCore(const char* filename)
 	{
 		romloaded = TRUE;
 		if(movieMode == MOVIEMODE_INACTIVE)
-		Unpause();
+			Unpause();
 
 		// Update the toolbar
 		MainWindowToolbar->EnableButton(IDM_PAUSE, true);