Merge from BRANCH_1_0

1 files changed, 1 insertions, 1 deletions

diff --git a/noncore/settings/language/language.cpp b/noncore/settings/language/language.cpp
index 8985fd5..d30a041 100644
--- a/noncore/settings/language/language.cpp
+++ b/noncore/settings/language/language.cpp
@@ -94,51 +94,51 @@ LanguageSettings::~LanguageSettings()
 void LanguageSettings::accept()
 {
 	applyLanguage();
 	QDialog::accept();
 }
 
 void LanguageSettings::applyLanguage()
 {
 	setLanguage ( langAvail. at ( languages-> currentItem ( )));
 }
 
 
 void LanguageSettings::reject()
 {
 	reset();
 	QDialog::reject();
 }
 
 void LanguageSettings::reset()
 {
 	QString l = getenv("LANG");
 	Config config("locale");
 	config.setGroup("Language");
 	l = config.readEntry( "Language", l );
+	actualLanguage = l;
 	if (l.isEmpty())
 		l = "en";
-	actualLanguage = l;
 
 	int n = langAvail.find( l );
 	languages->setCurrentItem( n );
 }
 
 QString LanguageSettings::actualLanguage;
 
 void LanguageSettings::setLanguage(const QString& lang)
 {
 	if ( lang != actualLanguage ) {
 		Config config("locale");
 		config.setGroup( "Language" );
 		if ( lang. isEmpty ( ))
 			config. removeEntry ( "Language" );
 		else
 			config.writeEntry( "Language", lang );
 		config.write();
 
 #if defined(Q_WS_QWS) && !defined(QT_NO_COP)
 
 		QCopEnvelope e("QPE/System", "language(QString)");
 		e << lang;
 #endif