From b5ecda4f3e1ef6d55953ab38afe63f16665edcfa Mon Sep 17 00:00:00 2001
From: "andres.delikat" <andres.delikat@4bbf4f03-6f44-549e-7e59-35d4b0962838>
Date: Thu, 30 Jun 2011 02:30:06 +0000
Subject: [PATCH] if commandline or autoload movie and no game, do openfile
 dialog, if still not game, don't attempt to load movie

---
 BizHawk.MultiClient/MainForm.cs | 32 +++++++++++++++++++++-----------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs
index 628726cad1..4171db9d20 100644
--- a/BizHawk.MultiClient/MainForm.cs
+++ b/BizHawk.MultiClient/MainForm.cs
@@ -154,20 +154,30 @@ namespace BizHawk.MultiClient
 
 			if (cmdMovie != null)
 			{
-				Movie m = new Movie(cmdMovie, MOVIEMODE.PLAY);
-				ReadOnly = true;
-				StartNewMovie(m, false);
-				CreateNewInputLog(false);
-				UserMovie.StartPlayback();
-				Global.Config.RecentMovies.Add(cmdMovie);
+				if (Global.Game == null)
+					OpenROM();
+				if (Global.Game != null)
+				{
+					Movie m = new Movie(cmdMovie, MOVIEMODE.PLAY);
+					ReadOnly = true;
+					StartNewMovie(m, false);
+					CreateNewInputLog(false);
+					UserMovie.StartPlayback();
+					Global.Config.RecentMovies.Add(cmdMovie);
+				}
 			}
 			else if (Global.Config.AutoLoadMostRecentMovie && !Global.Config.RecentMovies.IsEmpty())
 			{
-				Movie m = new Movie(Global.Config.RecentMovies.GetRecentFileByPosition(0), MOVIEMODE.PLAY);
-				ReadOnly = true;
-				StartNewMovie(m, false);
-				UserMovie.StartPlayback();
-				CreateNewInputLog(false);
+				if (Global.Game == null)
+					OpenROM();
+				if (Global.Game != null)
+				{
+					Movie m = new Movie(Global.Config.RecentMovies.GetRecentFileByPosition(0), MOVIEMODE.PLAY);
+					ReadOnly = true;
+					StartNewMovie(m, false);
+					UserMovie.StartPlayback();
+					CreateNewInputLog(false);
+				}
 			}
 			else
 			{