Skip to content

Commit f0fdd67

Browse files
authored
Merge pull request #15535 from daschuer/gh15533
Fix debug assert violation when building without stem support
2 parents d6a9b23 + 3bc73e2 commit f0fdd67

2 files changed

Lines changed: 9 additions & 4 deletions

File tree

src/skin/legacy/legacyskinparser.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -579,13 +579,11 @@ QList<QWidget*> LegacySkinParser::parseNode(const QDomElement& node) {
579579
result = wrapWidget(parseLabelWidget<WNumberDb>(node));
580580
} else if (nodeName == "Label") {
581581
result = wrapWidget(parseLabelWidget<WLabel>(node));
582-
}
582+
} else if (nodeName == "StemLabel") {
583583
#ifdef __STEM__
584-
else if (nodeName == "StemLabel") {
585584
result = wrapWidget(parseStemLabelWidget(node));
586-
}
587585
#endif
588-
else if (nodeName == "Knob") {
586+
} else if (nodeName == "Knob") {
589587
result = wrapWidget(parseStandardWidget<WKnob>(node));
590588
} else if (nodeName == "KnobComposed") {
591589
result = wrapWidget(parseStandardWidget<WKnobComposed>(node));

src/widget/weffectchainpresetselector.cpp

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,20 @@ void WEffectChainPresetSelector::setup(const QDomNode& node, const SkinContext&
3131
m_pChain = EffectWidgetUtils::getEffectChainFromNode(
3232
node, context, m_pEffectsManager);
3333

34+
#ifdef __STEM__
3435
VERIFY_OR_DEBUG_ASSERT(m_pChain != nullptr) {
3536
SKIN_WARNING(node,
3637
context,
3738
QStringLiteral("EffectChainPresetSelector node could not "
3839
"attach to EffectChain"));
3940
return;
4041
}
42+
#else
43+
if (m_pChain == nullptr) {
44+
// This happens if the skin has stem nodes but Mixxx has no stem support.
45+
return;
46+
}
47+
#endif
4148

4249
auto* pQuickEffectChain = qobject_cast<QuickEffectChain*>(m_pChain.data());
4350
if (pQuickEffectChain) {

0 commit comments

Comments
 (0)