From b4d5540304ebcea46b1315196f83c18a0a8fa6e8 Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Mon, 14 Sep 2015 19:51:59 -0700 Subject: [PATCH] Qt: Prevent savestate window from opening while in multiplayer --- CHANGES | 1 + src/platform/qt/Window.cpp | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/CHANGES b/CHANGES index 3f6d045e5..66552ef3e 100644 --- a/CHANGES +++ b/CHANGES @@ -16,6 +16,7 @@ Misc: - GBA: Better memory handling with PNG savestates - GBA Audio: Allow GBAAVStream to have no video callback - ARM7: Force disable LTO on two files to work around a GCC bug + - Qt: Prevent savestate window from opening while in multiplayer 0.3.0: (2015-08-16) Features: diff --git a/src/platform/qt/Window.cpp b/src/platform/qt/Window.cpp index f7e45de32..1135ea7ee 100644 --- a/src/platform/qt/Window.cpp +++ b/src/platform/qt/Window.cpp @@ -684,6 +684,10 @@ void Window::openStateWindow(LoadSave ls) { if (m_stateWindow) { return; } + MultiplayerController* multiplayer = m_controller->multiplayerController(); + if (multiplayer && multiplayer->attached() > 1) { + return; + } bool wasPaused = m_controller->isPaused(); m_stateWindow = new LoadSaveState(m_controller); connect(this, SIGNAL(shutdown()), m_stateWindow, SLOT(close()));