Skip to content
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

Jump to bottom

fix: segfault #153

Merged
merged 2 commits into from
Aug 25, 2024
Merged

fix: segfault #153

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f4770e0
fix: segfault
horriblename Aug 25, 2024
676e6df
fix: use proper pointer checks
horriblename Aug 25, 2024
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
25 changes: 16 additions & 9 deletions src/GestureManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ void GestureManager::sendCancelEventsToWindows() {

for (const auto& touch : this->touchedResources.all()) {
const auto t = touch.lock();
if (t.impl_) { // FIXME: idk how to check weak pointer validity
if (t.get()) {
t->sendCancel();
}
}
Expand Down Expand Up @@ -366,16 +366,23 @@ bool GestureManager::onTouchUp(ITouch::SUpEvent ev) {
if (**SEND_CANCEL) {
const auto surface = g_pInputManager->m_sTouchData.touchFocusSurface;

if (!surface.valid()) {
return true;
}

wl_client* client = surface.get()->client();
if (client) {
SP<CWLSeatResource> seat = g_pSeatManager->seatResourceForClient(client);
if (!client) {
return true;
}

if (seat) {
auto touches = seat.get()->touches;
for (const auto& touch : touches) {
this->touchedResources.remove(touch);
}
}
SP<CWLSeatResource> seat = g_pSeatManager->seatResourceForClient(client);
if (!seat.get()) {
return true;
}

auto touches = seat.get()->touches;
for (const auto& touch : touches) {
this->touchedResources.remove(touch);
}

return BLOCK;
Expand Down
Loading