From e1549658a23f0a1075c18ae16821d9c85cf4ecae Mon Sep 17 00:00:00 2001
From: Shawn Hoffman <godisgovernment@gmail.com>
Date: Wed, 3 Nov 2010 07:16:03 +0000
Subject: [PATCH] gray out ntsc-j option during emulation

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6336 8ced0084-cf51-0410-be5f-012b33b47a6e
---
 Source/Core/DolphinWX/Src/ConfigMain.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Source/Core/DolphinWX/Src/ConfigMain.cpp b/Source/Core/DolphinWX/Src/ConfigMain.cpp
index a1e0cae4a3..493c2da92e 100644
--- a/Source/Core/DolphinWX/Src/ConfigMain.cpp
+++ b/Source/Core/DolphinWX/Src/ConfigMain.cpp
@@ -175,7 +175,9 @@ void CConfigMain::UpdateGUI()
 		// Disable stuff on DisplayPage
 		FullscreenResolution->Disable();
 		RenderToMain->Disable();
-		
+		ProgressiveScan->Disable();
+		NTSCJ->Disable();
+
 
 		// Disable stuff on GamecubePage
 		GCSystemLang->Disable();
@@ -184,7 +186,6 @@ void CConfigMain::UpdateGUI()
 		// Disable stuff on WiiPage
 		WiiSensBarPos->Disable();
 		WiiScreenSaver->Disable();
-		ProgressiveScan->Disable();
 		WiiEuRGB60->Disable();
 		WiiAspectRatio->Disable();
 		WiiSystemLang->Disable();