Skip to content

fix icon streamer #41

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

Open
tomvita wants to merge 1 commit into
base: master
Choose a base branch
from
+16 −2
Open

fix icon streamer #41

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 16 additions & 2 deletions projects/menu/src/launcher/IconStreamer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,9 @@ void IconStreamer::onPageChanged(int currentPage, int iconsPerPage,

// Pre-reserve pool capacity so emplace_back() never reallocates.
// Reallocation would invalidate texture pointers already handed out
// to GlossyIcon widgets earlier in this loop.
// to GlossyIcon widgets earlier in this loop — but also pointers
// from *previous* onPageChanged() calls for icons that survived
// eviction. After a reallocation we must re-wire every loaded icon.
{
int newSlots = 0;
int freeAvail = (int)m_freeSlots.size();
Expand All @@ -170,7 +172,19 @@ void IconStreamer::onPageChanged(int currentPage, int iconsPerPage,
if (freeAvail > 0) --freeAvail;
else ++newSlots;
}
m_pool.reserve(m_pool.size() + newSlots);
if (newSlots > 0) {
auto* oldData = m_pool.data();
m_pool.reserve(m_pool.size() + newSlots);
if (m_pool.data() != oldData) {
// Pool was moved to a new allocation – re-wire every
// surviving icon so their Texture* pointers stay valid.
for (int i = 0; i < (int)m_pool.size(); ++i) {
int app = m_pool[i].appIndex;
if (app >= 0 && app < (int)allIcons.size())
allIcons[app]->setTexture(&m_pool[i].texture);
}
}
}
}

for (auto& d : decoded) {
Expand Down