[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/KDE/4.3/kdelibs/kdecore
From:       David Faure <faure () kde ! org>
Date:       2009-10-01 19:04:07
Message-ID: 1254423847.746829.23849.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1030167 by dfaure:

Backport race-condition fix


 M  +1 -0      localization/klocale.cpp  
 M  +1 -0      tests/klocalizedstringtest.cpp  


--- branches/KDE/4.3/kdelibs/kdecore/localization/klocale.cpp #1030166:1030167
@@ -788,6 +788,7 @@
                 << "Fix the program" << endl;
   }
 
+  QMutexLocker locker(mutex);
   // determine the fallback string
   QString fallback;
   if ( msgid_plural == NULL )
--- branches/KDE/4.3/kdelibs/kdecore/tests/klocalizedstringtest.cpp #1030166:1030167
@@ -238,6 +238,7 @@
     futures << QtConcurrent::run(this, &KLocalizedStringTest::correctSubs);
     futures << QtConcurrent::run(this, &KLocalizedStringTest::translateQt);
     futures << QtConcurrent::run(this, &KLocalizedStringTest::translateQt);
+    futures << QtConcurrent::run(this, &KLocalizedStringTest::translateToFrench);
     KGlobal::locale()->removeCatalog("kdelibs4");
     Q_FOREACH(QFuture<void> f, futures)
         f.waitForFinished();
[prev in list] [next in list] [prev in thread] [next in thread]