summaryrefslogtreecommitdiff
path: root/src/profile.cpp
diff options
context:
space:
mode:
authorTannin <devnull@localhost>2014-02-17 21:15:20 +0100
committerTannin <devnull@localhost>2014-02-17 21:15:20 +0100
commitf9eba9dc15ec655cc16efbb1ddccac3a562741d5 (patch)
treeb5768886088af4321285e24568d42ee2b200c47f /src/profile.cpp
parent9c8e43853dfeb6ac80faffe0960222ff0f087fd3 (diff)
- ini file changes that would have to overwrite ini tweaks are now stored in a separate file
and actually get used. - a warning message advices users to clean out that separate file - slightly improved default main window layout - bugfix: newly created ini tweaks were added to the list with incorrect properties
Diffstat (limited to 'src/profile.cpp')
-rw-r--r--src/profile.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/profile.cpp b/src/profile.cpp
index c1f1025e..41a867c5 100644
--- a/src/profile.cpp
+++ b/src/profile.cpp
@@ -201,6 +201,7 @@ void Profile::createTweakedIniFile()
}
}
+ mergeTweak(getProfileTweaks(), tweakedIni);
bool error = false;
if (!::WritePrivateProfileStringW(L"Archive", L"bInvalidateOlderFiles", L"1", ToWString(tweakedIni).c_str())) {
@@ -740,6 +741,11 @@ QString Profile::getIniFileName() const
return m_Directory.absoluteFilePath(ToQString(primaryIniFile));
}
+QString Profile::getProfileTweaks() const
+{
+ return QDir::cleanPath(m_Directory.absoluteFilePath(ToQString(AppConfig::profileTweakIni())));
+}
+
QString Profile::getPath() const
{