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

Added logic to reset TAS window hot keys if a key sequence is changed on the hotkey config dialog.

This commit is contained in:
mjbudd77 2021-12-06 20:54:16 -05:00
parent f351150ad9
commit 0271552ceb
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/drivers/Qt/TasEditor/TasEditorWindow.h
View File

@ -312,6 +312,7 @@ class TasEditorWindow : public QDialog
HISTORY history; HISTORY history;
BRANCHES branches; BRANCHES branches;
void initHotKeys(void);
void updateCaption(void); void updateCaption(void);
bool loadProject(const char* fullname); bool loadProject(const char* fullname);
void loadClipboard(const char *txt); void loadClipboard(const char *txt);
@ -328,7 +329,6 @@ class TasEditorWindow : public QDialog
QMenuBar *buildMenuBar(void); QMenuBar *buildMenuBar(void);
void buildPianoRollDisplay(void); void buildPianoRollDisplay(void);
void buildSideControlPanel(void); void buildSideControlPanel(void);
void initHotKeys(void);
void initPatterns(void); void initPatterns(void);
QMenu *recentProjectMenu; QMenu *recentProjectMenu;

6
src/drivers/Qt/input.cpp
View File

@ -30,6 +30,7 @@
#include "Qt/ConsoleWindow.h" #include "Qt/ConsoleWindow.h"
#include "Qt/ConsoleUtilities.h" #include "Qt/ConsoleUtilities.h"
#include "Qt/CheatsConf.h" #include "Qt/CheatsConf.h"
#include "Qt/TasEditor/TasEditorWindow.h"
#include "Qt/sdl.h" #include "Qt/sdl.h"
#include "Qt/sdl-video.h" #include "Qt/sdl-video.h"
@ -455,6 +456,11 @@ void setHotKeys(void)
{ {
Hotkeys[i].readConfig(); Hotkeys[i].readConfig();
} }
if ( tasWin != NULL )
{
tasWin->initHotKeys();
}
return; return;
} }