From d5c8ff7d7384352d2be0277cff8e4ed1fdd776d5 Mon Sep 17 00:00:00 2001
From: cc9cii <cc9c@iinet.net.au>
Date: Thu, 25 Sep 2014 18:15:34 +1000
Subject: [PATCH] More removal.
---
apps/opencs/editor.cpp | 3 +--
apps/opencs/model/settings/usersettings.cpp | 4 ++--
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/apps/opencs/editor.cpp b/apps/opencs/editor.cpp
index 57b0707aa..a8e5287e4 100644
--- a/apps/opencs/editor.cpp
+++ b/apps/opencs/editor.cpp
@@ -278,8 +278,7 @@ std::auto_ptr<sh::Factory> CS::Editor::setupGraphics()
else antialiasing = "0";
params.insert(std::make_pair("FSAA", antialiasing));
- std::string vsync = mUserSettings.settingValue("Video/vsync").toStdString() == "true" ? "true" : "false";
- params.insert(std::make_pair("vsync", vsync));
+ params.insert(std::make_pair("vsync", "false"));
params.insert(std::make_pair("hidden", "true"));
#if OGRE_PLATFORM == OGRE_PLATFORM_APPLE
params.insert(std::make_pair("macAPI", "cocoa"));
diff --git a/apps/opencs/model/settings/usersettings.cpp b/apps/opencs/model/settings/usersettings.cpp
index a4655f7bf..90758bdb0 100644
--- a/apps/opencs/model/settings/usersettings.cpp
+++ b/apps/opencs/model/settings/usersettings.cpp
@@ -424,9 +424,9 @@ void UserSettings::loadSettings (const QString &fileName)
mSettingDefinitions->setValue("shader mode", shader); //no group means "General" group
}
- // check if override entry exists (default: override)
+ // check if override entry exists (default: disabled)
if(!mSettingDefinitions->childGroups().contains("Video", Qt::CaseInsensitive))
- mSettingDefinitions->setValue("Video/use settings.cfg", "true");
+ mSettingDefinitions->setValue("Video/use settings.cfg", "false");
}
QStringList UserSettings::getOgreRenderers()