From 5ca3ed251ed7284af85383d3dd578a3c28edfca8 Mon Sep 17 00:00:00 2001 From: adelikat Date: Thu, 4 Mar 2010 15:09:49 +0000 Subject: [PATCH] Win32 - If .fm2 drag & dropped with no ROM load, the open ROM dialog will appear --- changelog.txt | 1 + src/drivers/win/window.cpp | 2 ++ 2 files changed, 3 insertions(+) diff --git a/changelog.txt b/changelog.txt index 322c3209..9b4d3fd1 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,4 @@ +03-march-2010 - adelikat - Win32 - If .fm2 drag & dropped with no ROM load, the open ROM dialog will appear 03-march-2010 - prockguy - fceux - now prints the name of the mapper on rom load 03-march-2010 - prockguy - SDL - VS unisystem keys now configable 03-march-2010 - prcokguy - SDL - changed default hotkeys and keys to match w32 diff --git a/src/drivers/win/window.cpp b/src/drivers/win/window.cpp index c2c6e5d2..b31bccad 100644 --- a/src/drivers/win/window.cpp +++ b/src/drivers/win/window.cpp @@ -1345,6 +1345,8 @@ LRESULT FAR PASCAL AppWndProc(HWND hWnd,UINT msg,WPARAM wParam,LPARAM lParam) //------------------------------------------------------- else if (!(fileDropped.find(".fm2") == string::npos) && (fileDropped.find(".fm2") == fileDropped.length()-4)) //ROM is already loaded and .fm2 in filename { + if (!GameInfo) //If no game is loaded, load the Open Game dialog + LoadNewGamey(hWnd, 0); if (GameInfo && !(fileDropped.find(".fm2") == string::npos)) //.fm2 is at the end of the filename so that must be the extension FCEUI_LoadMovie(ftmp, 1, false, false); //We are convinced it is a movie file, attempt to load it }