if commandline or autoload movie and no game, do openfile dialog, if still not game, don't attempt to load movie

This commit is contained in:
andres.delikat 2011-06-30 02:30:06 +00:00
parent 33cf3412de
commit b5ecda4f3e
1 changed files with 21 additions and 11 deletions

View File

@ -154,20 +154,30 @@ namespace BizHawk.MultiClient
if (cmdMovie != null) if (cmdMovie != null)
{ {
Movie m = new Movie(cmdMovie, MOVIEMODE.PLAY); if (Global.Game == null)
ReadOnly = true; OpenROM();
StartNewMovie(m, false); if (Global.Game != null)
CreateNewInputLog(false); {
UserMovie.StartPlayback(); Movie m = new Movie(cmdMovie, MOVIEMODE.PLAY);
Global.Config.RecentMovies.Add(cmdMovie); ReadOnly = true;
StartNewMovie(m, false);
CreateNewInputLog(false);
UserMovie.StartPlayback();
Global.Config.RecentMovies.Add(cmdMovie);
}
} }
else if (Global.Config.AutoLoadMostRecentMovie && !Global.Config.RecentMovies.IsEmpty()) else if (Global.Config.AutoLoadMostRecentMovie && !Global.Config.RecentMovies.IsEmpty())
{ {
Movie m = new Movie(Global.Config.RecentMovies.GetRecentFileByPosition(0), MOVIEMODE.PLAY); if (Global.Game == null)
ReadOnly = true; OpenROM();
StartNewMovie(m, false); if (Global.Game != null)
UserMovie.StartPlayback(); {
CreateNewInputLog(false); Movie m = new Movie(Global.Config.RecentMovies.GetRecentFileByPosition(0), MOVIEMODE.PLAY);
ReadOnly = true;
StartNewMovie(m, false);
UserMovie.StartPlayback();
CreateNewInputLog(false);
}
} }
else else
{ {