Skip to content

Commit 2c1d614

Browse files
authored
Merge pull request #15357 from acolombier/fix/soundmanager-leak
fix: correctly free reference to m_pSoundManager
2 parents 6d8fde5 + d43910d commit 2c1d614

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

src/coreservices.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -865,6 +865,7 @@ void CoreServices::finalize() {
865865
mixxx::qml::QmlPlayerManagerProxy::registerPlayerManager(nullptr);
866866
mixxx::qml::QmlConfigProxy::registerUserSettings(nullptr);
867867
mixxx::qml::QmlLibraryProxy::registerLibrary(nullptr);
868+
mixxx::qml::QmlSoundManagerProxy::registerManager(nullptr);
868869

869870
ControllerScriptEngineBase::registerTrackCollectionManager(nullptr);
870871
#endif

src/qml/qmlwaveformrenderer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@ QmlWaveformRendererFactory::Renderer QmlWaveformRendererMark::create(
338338
const QString endIcon = pMark->endIcon().toLocalFile();
339339
// FIXME: the following checks should be done on the WaveformMarker
340340
// setter (depends of #14515)
341-
if (!QFileInfo::exists(pixmap)) {
341+
if (!pixmap.isEmpty() && !QFileInfo::exists(pixmap)) {
342342
qmlEngine(this)->throwError(tr("Cannot find the marker pixmap") + " \"" + pixmap + '"');
343343
}
344344

0 commit comments

Comments
 (0)