File tree Expand file tree Collapse file tree 2 files changed +2
-1
lines changed Expand file tree Collapse file tree 2 files changed +2
-1
lines changed Original file line number Diff line number Diff line change @@ -865,6 +865,7 @@ void CoreServices::finalize() {
865
865
mixxx::qml::QmlPlayerManagerProxy::registerPlayerManager (nullptr );
866
866
mixxx::qml::QmlConfigProxy::registerUserSettings (nullptr );
867
867
mixxx::qml::QmlLibraryProxy::registerLibrary (nullptr );
868
+ mixxx::qml::QmlSoundManagerProxy::registerManager (nullptr );
868
869
869
870
ControllerScriptEngineBase::registerTrackCollectionManager (nullptr );
870
871
#endif
Original file line number Diff line number Diff line change @@ -338,7 +338,7 @@ QmlWaveformRendererFactory::Renderer QmlWaveformRendererMark::create(
338
338
const QString endIcon = pMark->endIcon ().toLocalFile ();
339
339
// FIXME: the following checks should be done on the WaveformMarker
340
340
// setter (depends of #14515)
341
- if (!QFileInfo::exists (pixmap)) {
341
+ if (!pixmap. isEmpty () && ! QFileInfo::exists (pixmap)) {
342
342
qmlEngine (this )->throwError (tr (" Cannot find the marker pixmap" ) + " \" " + pixmap + ' "' );
343
343
}
344
344
You can’t perform that action at this time.
0 commit comments