Skip to content

Fix cache UI actions without UI context #8508

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
plafosse wants to merge 1 commit into
base: dev
Choose a base branch
from
+38 −14
Open

Fix cache UI actions without UI context #8508

Show file tree
Hide file tree
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: 13 additions & 5 deletions view/kernelcache/ui/KernelCacheUINotifications.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,17 +108,25 @@ void UINotifications::OnViewChange(UIContext* context, ViewFrame* frame, const Q
uint64_t addr = 0;
if (GetAddressInput(addr, "Address", "Address"))
{
BackgroundThread::create(ctx.context->mainWindow())
->thenBackground([ctx, addr]() {
loadImageAtAddr(*ctx.binaryView, addr);
auto view = ctx.binaryView;
if (!view)
return;
auto owner = ctx.context ? ctx.context->mainWindow() : nullptr;
BackgroundThread::create(owner)
->thenBackground([view, addr]() {
loadImageAtAddr(*view, addr);
})->start();
}
};

auto loadImageTokenAction = [](const UIActionContext& ctx) {
auto view = ctx.binaryView;
if (!view)
return;
uint64_t addr = TokenAddress(ctx);
BackgroundThread::create(ctx.context->mainWindow())
->thenBackground([ctx, addr](){ loadImageAtAddr(*ctx.binaryView, addr); })
auto owner = ctx.context ? ctx.context->mainWindow() : nullptr;
BackgroundThread::create(owner)
->thenBackground([view, addr](){ loadImageAtAddr(*view, addr); })
->start();
};

Expand Down
34 changes: 25 additions & 9 deletions view/sharedcache/ui/SharedCacheUINotifications.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,9 +129,13 @@ void UINotifications::OnViewChange(UIContext* context, ViewFrame* frame, const Q
uint64_t addr = 0;
if (GetAddressInput(addr, "Address", "Address"))
{
BackgroundThread::create(ctx.context->mainWindow())
->thenBackground([ctx, addr]() {
loadImageAtAddr(*ctx.binaryView, addr);
auto view = ctx.binaryView;
if (!view)
return;
auto owner = ctx.context ? ctx.context->mainWindow() : nullptr;
BackgroundThread::create(owner)
->thenBackground([view, addr]() {
loadImageAtAddr(*view, addr);
})->start();
}
};
Expand All @@ -140,23 +144,35 @@ void UINotifications::OnViewChange(UIContext* context, ViewFrame* frame, const Q
uint64_t addr = 0;
if (GetAddressInput(addr, "Address", "Address"))
{
BackgroundThread::create(ctx.context->mainWindow())
->thenBackground([ctx, addr](){ loadRegionAtAddr(*ctx.binaryView, addr); })
auto view = ctx.binaryView;
if (!view)
return;
auto owner = ctx.context ? ctx.context->mainWindow() : nullptr;
BackgroundThread::create(owner)
->thenBackground([view, addr](){ loadRegionAtAddr(*view, addr); })
->start();
}
};

auto loadRegionTokenAction = [](const UIActionContext& ctx) {
auto view = ctx.binaryView;
if (!view)
return;
uint64_t addr = TokenAddress(ctx);
BackgroundThread::create(ctx.context->mainWindow())
->thenBackground([ctx, addr](){ loadRegionAtAddr(*ctx.binaryView, addr); })
auto owner = ctx.context ? ctx.context->mainWindow() : nullptr;
BackgroundThread::create(owner)
->thenBackground([view, addr](){ loadRegionAtAddr(*view, addr); })
->start();
};

auto loadImageTokenAction = [](const UIActionContext& ctx) {
auto view = ctx.binaryView;
if (!view)
return;
uint64_t addr = TokenAddress(ctx);
BackgroundThread::create(ctx.context->mainWindow())
->thenBackground([ctx, addr](){ loadImageAtAddr(*ctx.binaryView, addr); })
auto owner = ctx.context ? ctx.context->mainWindow() : nullptr;
BackgroundThread::create(owner)
->thenBackground([view, addr](){ loadImageAtAddr(*view, addr); })
->start();
};

Expand Down