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

Qt: Cap the maximum number of multiplayer windows

This commit is contained in:
Jeffrey Pfau 2015-05-30 00:34:53 -07:00
parent 27b4f35139
commit 0378fa229d
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -31,6 +31,7 @@ Bugfixes:
- Qt: Better cleanup when a game crashes - Qt: Better cleanup when a game crashes
- Qt: Fix open ROM dialog filtering for archive formats - Qt: Fix open ROM dialog filtering for archive formats
- ARM7: Fix Thumb MUL timing - ARM7: Fix Thumb MUL timing
- Qt: Cap the maximum number of multiplayer windows
Misc: Misc:
- Qt: Handle saving input settings better - Qt: Handle saving input settings better
- Debugger: Free watchpoints in addition to breakpoints - Debugger: Free watchpoints in addition to breakpoints

5
src/platform/qt/GBAApp.cpp
View File

@ -67,7 +67,10 @@ bool GBAApp::event(QEvent* event) {
return QApplication::event(event); return QApplication::event(event);
} }
Window* GBAApp::newWindowInternal() { Window* GBAApp::newWindow() {
if (m_multiplayer.attached() >= MAX_GBAS) {
return nullptr;
}
Window* w = new Window(&m_configController, m_multiplayer.attached()); Window* w = new Window(&m_configController, m_multiplayer.attached());
m_windows[m_multiplayer.attached()] = w; m_windows[m_multiplayer.attached()] = w;
w->setAttribute(Qt::WA_DeleteOnClose); w->setAttribute(Qt::WA_DeleteOnClose);