ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
BizHawk.MultiClient/MainForm.cs
View File

@ -153,6 +153,10 @@ namespace BizHawk.MultiClient
LoadRomFromRecent(Global.Config.RecentRoms.GetRecentFileByPosition(0)); LoadRomFromRecent(Global.Config.RecentRoms.GetRecentFileByPosition(0));
if (cmdMovie != null) if (cmdMovie != null)
{
if (Global.Game == null)
OpenROM();
if (Global.Game != null)
{ {
Movie m = new Movie(cmdMovie, MOVIEMODE.PLAY); Movie m = new Movie(cmdMovie, MOVIEMODE.PLAY);
ReadOnly = true; ReadOnly = true;
@ -161,7 +165,12 @@ namespace BizHawk.MultiClient
UserMovie.StartPlayback(); UserMovie.StartPlayback();
Global.Config.RecentMovies.Add(cmdMovie); Global.Config.RecentMovies.Add(cmdMovie);
} }
}
else if (Global.Config.AutoLoadMostRecentMovie && !Global.Config.RecentMovies.IsEmpty()) else if (Global.Config.AutoLoadMostRecentMovie && !Global.Config.RecentMovies.IsEmpty())
{
if (Global.Game == null)
OpenROM();
if (Global.Game != null)
{ {
Movie m = new Movie(Global.Config.RecentMovies.GetRecentFileByPosition(0), MOVIEMODE.PLAY); Movie m = new Movie(Global.Config.RecentMovies.GetRecentFileByPosition(0), MOVIEMODE.PLAY);
ReadOnly = true; ReadOnly = true;
@ -169,6 +178,7 @@ namespace BizHawk.MultiClient
UserMovie.StartPlayback(); UserMovie.StartPlayback();
CreateNewInputLog(false); CreateNewInputLog(false);
} }
}
else else
{ {
CreateNewInputLog(true); CreateNewInputLog(true);