From: K.Ohta <whatisthis.sowhat@gmail.com>
Date: Fri, 2 Oct 2015 00:10:09 +0000 (+0900)
Subject: [UI][Qt][DISPLAY] Fix not affect configuration : UI <-> VM <-> CONFIG-FILE around... 
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=3fe9e1b26717103bc544686fdd864daed63e7496;p=csp-qt%2Fcommon_source_project-fm7.git

[UI][Qt][DISPLAY] Fix not affect configuration : UI <-> VM <-> CONFIG-FILE around OpenGL.
Please enter the commit message for your changes. Lines starting
---

diff --git a/source/src/config.cpp b/source/src/config.cpp
index f763c3bc9..cb7d5963f 100644
--- a/source/src/config.cpp
+++ b/source/src/config.cpp
@@ -265,7 +265,7 @@ void init_config()
 	config.multiple_speakers = false;
 	config.general_sound_level = 0;
 
-#if defined(USE_QT)
+#if defined(_USE_QT)
 	config.use_opengl_scanline = false;
 	config.opengl_scanline_vert = false;
 	config.opengl_scanline_horiz = false;
@@ -432,7 +432,7 @@ void load_config()
 #ifdef USE_SCREEN_ROTATE
 	config.rotate_type = GetPrivateProfileBool(_T("Screen"), _T("RotateType"), config.rotate_type, config_path);
 #endif
-#if defined(USE_QT)
+#if defined(_USE_QT)
 	config.use_opengl_scanline = GetPrivateProfileBool(_T("Screen"), _T("UseOpenGLScanLine"),
 													   config.use_opengl_scanline, config_path);
 	config.opengl_scanline_vert = GetPrivateProfileBool(_T("Screen"), _T("OpenGLScanLineVert"),
@@ -623,7 +623,7 @@ void save_config()
 #ifdef USE_SCREEN_ROTATE
 	WritePrivateProfileBool(_T("Screen"), _T("RotateType"), config.rotate_type, config_path);
 #endif
-#if defined(USE_QT)
+#if defined(_USE_QT)
 	WritePrivateProfileBool(_T("Screen"), _T("UseOpenGLScanLine"),
 							config.use_opengl_scanline, config_path);
 	WritePrivateProfileBool(_T("Screen"), _T("OpenGLScanLineVert"),
diff --git a/source/src/qt/gui/menu_screen.cpp b/source/src/qt/gui/menu_screen.cpp
index 058704eaf..e8a3e75ea 100644
--- a/source/src/qt/gui/menu_screen.cpp
+++ b/source/src/qt/gui/menu_screen.cpp
@@ -123,7 +123,7 @@ void Ui_MainWindow::ConfigScreenMenu(void)
 	actionOpenGL_Filter->setObjectName(QString::fromUtf8("actionOpenGL_Filter"));
 	actionOpenGL_Filter->setEnabled(true);
 	actionOpenGL_Filter->setCheckable(true);
-	if(config.use_opengl_filters == 0) actionOpenGL_Filter->setChecked(true);
+	if(config.use_opengl_filters) actionOpenGL_Filter->setChecked(true);
 	connect(actionOpenGL_Filter, SIGNAL(toggled(bool)), this, SLOT(set_gl_crt_filter(bool)));
 
 	actionDot_by_Dot = new Action_Control(this);