Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-24 02:42:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

use non-recursive mutex for QVariantAnimation interpolators

Browse source 
fixes crashes on FreeBSD

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2021-07-23 00:39:12 +03:00
parent 0a1a351142
commit 8a2d99ee85
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/gui/animation/qvariantanimation.cpp
View file

@ -134,7 +134,7 @@ QT_BEGIN_NAMESPACE
\sa currentValue
*/
static std::recursive_mutex qGlobalVariantAnimationMutex;
Q_GLOBAL_STATIC(QMutex, qGlobalVariantAnimationMutex);
static bool animationValueLessThan(const QVariantAnimation::KeyValue &p1, const QVariantAnimation::KeyValue &p2)
{
@ -407,13 +407,12 @@ Q_GLOBAL_STATIC(QInterpolatorVector, registeredInterpolators)
*/
void QVariantAnimation::registerInterpolator(QVariantAnimation::Interpolator func, int interpolationType)
{
// will override any existing interpolators
QMutexLocker locker(qGlobalVariantAnimationMutex());
QInterpolatorVector *interpolators = registeredInterpolators();
// When built on solaris with GCC, the destructors can be called
// in such an order that we get here with interpolators == NULL,
// to continue causes the app to crash on exit with a SEGV
// the unregistration of interpolators can be called in such an order that we get here with
// interpolators == NULL which causes the app to crash on exit with a SEGV
if (interpolators) {
std::lock_guard<std::recursive_mutex> locker(qGlobalVariantAnimationMutex);
// will override any existing interpolators
if (interpolationType >= interpolators->count())
interpolators->resize(interpolationType + 1);
interpolators->replace(interpolationType, func);
@ -422,8 +421,8 @@ void QVariantAnimation::registerInterpolator(QVariantAnimation::Interpolator fun
QVariantAnimation::Interpolator QVariantAnimationPrivate::getInterpolator(int interpolationType)
{
QMutexLocker locker(qGlobalVariantAnimationMutex());
QInterpolatorVector *interpolators = registeredInterpolators();
std::lock_guard<std::recursive_mutex> locker(qGlobalVariantAnimationMutex);
if (interpolationType < interpolators->count()) {
QVariantAnimation::Interpolator ret = interpolators->at(interpolationType);
if (ret) return ret;