diff --git a/src/coreservices.cpp b/src/coreservices.cpp index f50c6d9fff18..a96a9e286404 100644 --- a/src/coreservices.cpp +++ b/src/coreservices.cpp @@ -865,6 +865,7 @@ void CoreServices::finalize() { mixxx::qml::QmlPlayerManagerProxy::registerPlayerManager(nullptr); mixxx::qml::QmlConfigProxy::registerUserSettings(nullptr); mixxx::qml::QmlLibraryProxy::registerLibrary(nullptr); + mixxx::qml::QmlSoundManagerProxy::registerManager(nullptr); ControllerScriptEngineBase::registerTrackCollectionManager(nullptr); #endif diff --git a/src/qml/qmlwaveformrenderer.cpp b/src/qml/qmlwaveformrenderer.cpp index 77017e9683e8..08eee1717368 100644 --- a/src/qml/qmlwaveformrenderer.cpp +++ b/src/qml/qmlwaveformrenderer.cpp @@ -338,7 +338,7 @@ QmlWaveformRendererFactory::Renderer QmlWaveformRendererMark::create( const QString endIcon = pMark->endIcon().toLocalFile(); // FIXME: the following checks should be done on the WaveformMarker // setter (depends of #14515) - if (!QFileInfo::exists(pixmap)) { + if (!pixmap.isEmpty() && !QFileInfo::exists(pixmap)) { qmlEngine(this)->throwError(tr("Cannot find the marker pixmap") + " \"" + pixmap + '"'); }