Commit abfbd790 authored by Han Young's avatar Han Young Committed by Nate Graham
Browse files

fix localegenhleper and locale save bug

parent 8df9bef6
......@@ -63,22 +63,22 @@ void KCMRegionAndLang::save()
{
// assemble full locales in use
QStringList locales;
if (settings()->isDefaultSetting(SettingType::Lang)) {
if (!settings()->isDefaultSetting(SettingType::Lang)) {
locales.append(settings()->lang());
}
if (settings()->isDefaultSetting(SettingType::Numeric)) {
if (!settings()->isDefaultSetting(SettingType::Numeric)) {
locales.append(settings()->numeric());
}
if (settings()->isDefaultSetting(SettingType::Time)) {
if (!settings()->isDefaultSetting(SettingType::Time)) {
locales.append(settings()->time());
}
if (settings()->isDefaultSetting(SettingType::Measurement)) {
if (!settings()->isDefaultSetting(SettingType::Measurement)) {
locales.append(settings()->measurement());
}
if (settings()->isDefaultSetting(SettingType::Currency)) {
if (!settings()->isDefaultSetting(SettingType::Currency)) {
locales.append(settings()->monetary());
}
if (settings()->isDefaultSetting(SettingType::PaperSize)) {
if (!settings()->isDefaultSetting(SettingType::PaperSize)) {
locales.append(settings()->paperSize());
}
if (!settings()->language().isEmpty()) {
......
......@@ -164,6 +164,7 @@ void LocaleGenHelper::handleLocaleGen(int statusCode, QProcess::ExitStatus statu
void LocaleGenHelper::exitAfterTimeOut()
{
m_isGenerating = false;
m_timer.start(30s);
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment