diff options
| author | comex <comexk@gmail.com> | 2015-04-25 00:58:16 -0400 |
|---|---|---|
| committer | comex <comexk@gmail.com> | 2015-04-25 00:58:16 -0400 |
| commit | 7fe13d9af81e547beb98724579f6d389531666d0 (patch) | |
| tree | 1817cc9546b7e76a56009b9921913dc352272f9b /Source/Core/DolphinWX/Config/ConfigMain.cpp | |
| parent | 9d8c347e8df64296cdf7b566ae36cd3a1af6aa09 (diff) | |
| parent | 48a1d97fe7557234e1aa36d930789f574543fc19 (diff) | |
Merge pull request #2175 from RachelBryk/oc
Disable oc setting while netplay or movie is active.
Diffstat (limited to 'Source/Core/DolphinWX/Config/ConfigMain.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/Config/ConfigMain.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Source/Core/DolphinWX/Config/ConfigMain.cpp b/Source/Core/DolphinWX/Config/ConfigMain.cpp index 3bd1bb9520..f96b47688d 100644 --- a/Source/Core/DolphinWX/Config/ConfigMain.cpp +++ b/Source/Core/DolphinWX/Config/ConfigMain.cpp @@ -9,6 +9,8 @@ #include "Common/CommonTypes.h" #include "Core/ConfigManager.h" +#include "Core/Movie.h" +#include "Core/NetPlayProto.h" #include "DolphinWX/WxUtils.h" #include "DolphinWX/Config/AdvancedConfigPane.h" #include "DolphinWX/Config/AudioConfigPane.h" @@ -72,6 +74,8 @@ void CConfigMain::CreateGUIControls() Notebook->AddPage(wii_pane, _("Wii")); Notebook->AddPage(path_pane, _("Paths")); Notebook->AddPage(advanced_pane, _("Advanced")); + if (Movie::IsMovieActive() || NetPlay::IsNetPlayRunning()) + advanced_pane->Disable(); wxBoxSizer* const main_sizer = new wxBoxSizer(wxVERTICAL); main_sizer->Add(Notebook, 1, wxEXPAND | wxALL, 5); |