Skip to content

Fix crash when saving 2D config with panel size larger than configured LED count #4973

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
+5 −1
Closed

Fix crash when saving 2D config with panel size larger than configured LED count #4973

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ed3b092
Initial plan
Copilot Oct 2, 2025
25a875e
Fix race condition in 2D config save by deferring resume()
Copilot Oct 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion wled00/FX_2Dfcn.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ void WS2812FX::setUpMatrix() {

// delete gap array as we no longer need it
p_free(gapTable);
resume();
// NOTE: do not resume() here; caller must call resume() after segments are updated

#ifdef WLED_DEBUG
DEBUG_PRINT(F("Matrix ledmap:"));
Expand All @@ -130,6 +130,7 @@ void WS2812FX::setUpMatrix() {
Segment::maxWidth = _length;
Segment::maxHeight = 1;
resetSegments();
resume(); // resume here since resetSegments() was called
}
}
#else
Expand Down
1 change: 1 addition & 0 deletions wled00/set.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -817,6 +817,7 @@ void handleSettingsSet(AsyncWebServerRequest *request, byte subPage)
strip.panel.shrink_to_fit(); // release unused memory
strip.deserializeMap(); // (re)load default ledmap (will also setUpMatrix() if ledmap does not exist)
strip.makeAutoSegments(true); // force re-creation of segments
strip.resume(); // resume strip service after 2D config changes are complete
}
#endif

Expand Down
2 changes: 2 additions & 0 deletions wled00/wled.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,7 @@ void WLED::loop()
strip.finalizeInit(); // will create buses and also load default ledmap if present
if (aligned) strip.makeAutoSegments();
else strip.fixInvalidSegments();
strip.resume(); // resume strip service after bus re-initialization
BusManager::setBrightness(scaledBri(bri)); // fix re-initialised bus' brightness #4005 and #4824
configNeedsWrite = true;
}
Expand Down Expand Up @@ -563,6 +564,7 @@ void WLED::beginStrip()
strip.setTransition(0); // temporarily prevent transitions to reduce segment copies
strip.finalizeInit(); // busses created during deserializeConfig() if config existed
strip.makeAutoSegments();
strip.resume(); // resume strip service after initialization
strip.setBrightness(0);
strip.setShowCallback(handleOverlayDraw);
doInitBusses = false;
Expand Down