diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-01-06 09:47:33 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-01-06 09:47:33 +0100 |
| commit | 7a3b8907060123fe5d487d4c9ba3a1e222f468bb (patch) | |
| tree | cb419d68eedddc1adbd6dbb84888767edc7fb3bf /src/multimedia/audio | |
| parent | 4a6f459d193b621a77e002944eb28e4e96f2e2c7 (diff) | |
| parent | 13df2988efbe9a82225ccbf4cad463391d94c8e8 (diff) | |
| download | qtmultimedia-7a3b8907060123fe5d487d4c9ba3a1e222f468bb.tar.gz | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
.qmake.conf
Change-Id: I3d6e69f3f99b2f0a0e2c29ffdd02176e1f22304e
Diffstat (limited to 'src/multimedia/audio')
| -rw-r--r-- | src/multimedia/audio/qsamplecache_p.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/multimedia/audio/qsamplecache_p.cpp b/src/multimedia/audio/qsamplecache_p.cpp index 487346832..c76f51899 100644 --- a/src/multimedia/audio/qsamplecache_p.cpp +++ b/src/multimedia/audio/qsamplecache_p.cpp @@ -140,8 +140,11 @@ void QSampleCache::loadingRelease() QMutexLocker locker(&m_loadingMutex); m_loadingRefCount--; if (m_loadingRefCount == 0) { - if (m_loadingThread.isRunning()) + if (m_loadingThread.isRunning()) { + m_networkAccessManager->deleteLater(); + m_networkAccessManager = nullptr; m_loadingThread.exit(); + } } } |