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

win32: allow port command line arguments to work

This commit is contained in:
OV2 2014-05-25 18:12:36 +02:00
parent ba712914aa
commit 7948c062ca
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
win32/wsnes9x.cpp
View File

@ -10880,8 +10880,10 @@ void S9xPostRomInit()
if(!S9xMovieActive() && !startingMovie) if(!S9xMovieActive() && !startingMovie)
{ {
// revert previously forced control // revert previously forced control
if(GUI.ControlForced!=0xff) if(GUI.ControlForced!=0xff) {
GUI.ControllerOption = GUI.ControlForced; GUI.ControllerOption = GUI.ControlForced;
ChangeInputDevice();
}
int prevController = GUI.ControllerOption; int prevController = GUI.ControllerOption;
GUI.ValidControllerOptions = 0xFFFF; GUI.ValidControllerOptions = 0xFFFF;
@ -10964,10 +10966,10 @@ void S9xPostRomInit()
GUI.ValidControllerOptions = (1<<SNES_MOUSE_SWAPPED) | (1<<SNES_MULTIPLAYER5) | (1<<SNES_JOYPAD); GUI.ValidControllerOptions = (1<<SNES_MOUSE_SWAPPED) | (1<<SNES_MULTIPLAYER5) | (1<<SNES_JOYPAD);
break; break;
} }
ChangeInputDevice();
} }
// update menu and remember what (if anything) the control was forced from // update menu and remember what (if anything) the control was forced from
ChangeInputDevice();
GUI.ControlForced = prevController; GUI.ControlForced = prevController;
} }