From 5e44ec6f4a2c692de0ddb7b4266ce1c428566d82 Mon Sep 17 00:00:00 2001 From: punkrockguy318 Date: Tue, 12 Aug 2008 08:24:39 +0000 Subject: [PATCH] fixed segfault when opening fcm files; will now warn user to open fm2 files --- changelog.txt | 2 +- src/drivers/sdl/input.cpp | 15 +++++++++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/changelog.txt b/changelog.txt index 4f0759f5..35406dd2 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,5 +1,5 @@ ---version 2.0.2 released--- - +12-aug-2008 - punkrockguy318 - SDL: fixed segfault when opening .fcm files 12-aug-2008 - punkrockguy318 - SDL: Saner sound defaults for less choppy sound 12-aug-2008 - punkrockguy318 - SF [ 2047050 ] SDL: "--special" option fixed for special video scaling filters 12-aug-2008 - zeromus - SF [ 2046984 ] Player 3 inputs when not used diff --git a/src/drivers/sdl/input.cpp b/src/drivers/sdl/input.cpp index 689e10fd..0ad905aa 100644 --- a/src/drivers/sdl/input.cpp +++ b/src/drivers/sdl/input.cpp @@ -296,11 +296,18 @@ KeyboardCommands() if(is_shift) { FCEUI_StopMovie(); std::string fname; - fname = GetFilename("Open movie for playback..."); + fname = GetFilename("Open FM2 movie for playback..."); if(fname != "") - { - FCEUI_printf("Playing back movie located at %s\n", fname.c_str()); - FCEUI_LoadMovie(fname.c_str(), false, false, false); + { + if(fname.find(".fm2") != std::string::npos) + { + FCEUI_printf("Playing back movie located at %s\n", fname.c_str()); + FCEUI_LoadMovie(fname.c_str(), false, false, false); + } + else + { + FCEUI_printf("Only FM2 movies are supported.\n"); + } } } else { FCEUI_LoadState(NULL);