From f0b8905a5dbcf4edfe38c20848b432e46fac8f51 Mon Sep 17 00:00:00 2001 From: Souryo Date: Wed, 9 Jul 2014 19:54:21 -0400 Subject: [PATCH] Disabled some menu options when playing/recording movies --- GUI/MainWindow.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/GUI/MainWindow.cpp b/GUI/MainWindow.cpp index 7c807165..ff90ee51 100644 --- a/GUI/MainWindow.cpp +++ b/GUI/MainWindow.cpp @@ -339,7 +339,7 @@ namespace NES SetMenuEnabled(ID_NES_STOP, romLoaded && !clientConnected); SetMenuEnabled(ID_NES_RESUME, !running && romLoaded); - SetMenuEnabled(ID_FILE_QUICKLOAD, running && !clientConnected); + SetMenuEnabled(ID_FILE_QUICKLOAD, running && !clientConnected && !moviePlayingRecording); SetMenuEnabled(ID_FILE_QUICKSAVE, running); SetMenuEnabled(ID_MOVIES_PLAY, romLoaded && !clientConnected && !moviePlayingRecording); @@ -347,10 +347,10 @@ namespace NES SetMenuEnabled(ID_RECORDFROM_NOW, romLoaded && !moviePlayingRecording); SetMenuEnabled(ID_MOVIES_STOP, moviePlayingRecording); - SetMenuEnabled(ID_NETPLAY_STARTSERVER, !serverStarted && !clientConnected); + SetMenuEnabled(ID_NETPLAY_STARTSERVER, !serverStarted && !clientConnected && !Movie::Playing()); SetMenuEnabled(ID_NETPLAY_STOPSERVER, serverStarted && !clientConnected); - SetMenuEnabled(ID_NETPLAY_CONNECT, !serverStarted && !clientConnected); + SetMenuEnabled(ID_NETPLAY_CONNECT, !serverStarted && !clientConnected && !Movie::Playing()); SetMenuEnabled(ID_NETPLAY_DISCONNECT, !serverStarted && clientConnected); SetMenuCheck(ID_SAVESTATESLOT_1, _currentSaveSlot == 0);