Skip to content

fix(ui): fix stale item list after switching category tabs #64

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

Merged
codepuncher merged 1 commit into from
Oct 29, 2026
Merged

fix(ui): fix stale item list after switching category tabs #64

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
39 changes: 22 additions & 17 deletions src/InvalidateMemo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,13 +237,10 @@ namespace InventoryInjectorImproved::InvalidateMemo

/**
* ItemMenu.as's RestoreIndices sets a one-shot onInvalidate to restore
* scroll/selection after suspend; skipping here would drop it silently.
* scroll/selection after suspend; skipping this call would drop it silently.
*/
RE::GFxValue onInvalidate;
if (itemList.GetMember("onInvalidate", &onInvalidate) && !onInvalidate.IsUndefined()) {
InvokeOriginal(a_params);
return;
}
const bool callbackPending = itemList.GetMember("onInvalidate", &onInvalidate) && !onInvalidate.IsUndefined();

const std::vector<FpEntry> entries = ReadEntries(itemList);
const FpConfig config = ReadConfig(itemList);
Expand All @@ -253,7 +250,7 @@ namespace InventoryInjectorImproved::InvalidateMemo
const bool fpMatches = s.lastProcessedFp && fp == *s.lastProcessedFp;
const bool rendered = ListAlreadyRendered(entries);
const bool forced = ForceReprocessFlag().exchange(false, std::memory_order_relaxed);
if (fpMatches && rendered && !forced) {
if (fpMatches && rendered && !forced && !callbackPending) {
++s.skipped;
if (spdlog::should_log(spdlog::level::debug)) {
logger::debug("InvalidateMemo: SKIP fp=0x{:x} entries={} unrendered={} countSum={}",
Expand All @@ -265,21 +262,29 @@ namespace InventoryInjectorImproved::InvalidateMemo

const bool invoked = InvokeOriginal(a_params);
++s.processed;
/**
* A failed invoke may have half-processed the list, so forget the last
* fingerprint rather than let the next call match it and be skipped.
*/
if (!invoked) {
s.lastProcessedFp.reset();
LogTally(s);

return;
}
/**
* Record the settled post-process fingerprint, not the pre-process one:
* data processors mutate hashed fields (e.g. book flags) during the pass.
* Skip recording on invoke failure so a failed pass can't look settled.
* data processors mutate hashed fields (e.g. book flags) while running.
*/
if (invoked) {
const std::uint64_t postFp = ComputeFingerprint(itemList);
if (spdlog::should_log(spdlog::level::debug)) {
logger::debug(
"InvalidateMemo: PROCESS fp=0x{:x}->0x{:x} entries={} unrendered={} countSum={} "
"fpMatched={} rendered={}",
fp, postFp, entries.size(), UnrenderedCount(entries), CountChecksum(entries), fpMatches, rendered);
}
s.lastProcessedFp = postFp;
const std::uint64_t postFp = ComputeFingerprint(itemList);
if (spdlog::should_log(spdlog::level::debug)) {
logger::debug(
"InvalidateMemo: PROCESS fp=0x{:x}->0x{:x} entries={} unrendered={} countSum={} "
"fpMatched={} rendered={} callbackPending={}",
fp, postFp, entries.size(), UnrenderedCount(entries), CountChecksum(entries), fpMatches, rendered,
callbackPending);
}
s.lastProcessedFp = postFp;
LogTally(s);
}

Expand Down
Loading