Changeset 599

Timestamp:

Feb 24, 2010, 8:03:51 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

corelib: Fixed crash in QVariantAnimation::registerInterpolator(): the function was called from the static destructor code at program termination, after the static destructor for registeredInterpolators() was called (the C++ standard doesn't define the order in which static objects in different compilation units are destroyed).

File:

• trunk/src/corelib/animation/qvariantanimation.cpp (modified) (3 diffs)

trunk/src/corelib/animation/qvariantanimation.cpp

@@ -220 +220 @@
     else
         interpolator = 0;
-    
+
     //we make sure that the interpolator is always set to something
     if (!interpolator)
@@ -249 +249 @@
                                                                       animationValueLessThan);
         if (it == keyValues.constBegin()) {
-            //the item pointed to by it is the start element in the range    
+            //the item pointed to by it is the start element in the range
             if (it->first == 0 && keyValues.count() > 1) {
                 currentInterval.start = *it;
@@ -432 +432 @@
     // will override any existing interpolators
     QInterpolatorVector *interpolators = registeredInterpolators();
+
+
+
+
     QMutexLocker locker(QMutexPool::globalInstanceGet(interpolators));
     if (int(interpolationType) >= interpolators->count())