From f22a4735b8f8cc52326f06649e8c0da8a5c6adae Mon Sep 17 00:00:00 2001
From: jeblanchard <jeblanchard@users.sf.net>
Date: Thu, 29 May 2008 15:15:00 +0000
Subject: [PATCH] Crash less

---
 src/drivers/win/main.cpp | 2 +-
 src/movie.cpp            | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/drivers/win/main.cpp b/src/drivers/win/main.cpp
index 47d1008e..77713786 100644
--- a/src/drivers/win/main.cpp
+++ b/src/drivers/win/main.cpp
@@ -681,7 +681,7 @@ int main(int argc,char *argv[])
 	}
 
 
-	if(MovieToLoad)
+	if(GameInfo && MovieToLoad)
 	{
 		FCEUI_LoadMovie(MovieToLoad, 1, 0);
 		free(MovieToLoad);
diff --git a/src/movie.cpp b/src/movie.cpp
index 9b553720..428c03f7 100644
--- a/src/movie.cpp
+++ b/src/movie.cpp
@@ -401,6 +401,7 @@ void FCEUI_LoadMovie(char *fname, bool _read_only, int _pauseframe)
 	
 	strcpy(curMovieFilename, fname);
 	FILE* fp = FCEUD_UTF8fopen(fname, "rb");
+	if (!fp) return;
 	LoadFM2(currMovieData, fp);
 	fclose(fp);