RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-07 16:47:36 +00:00
Code Issues Activity Actions

PixelPaint: Keep a RefPtr to offset_text_box in EditGuideDialog

Browse source 
Keep a RefPtr to offset_text_box in EditGuideDialog instead of using
a local pointer. Previously the lambda in ok_button.on_click() would
outlive the local variable causing a crash.
This commit is contained in:
Marcus Nilsson 2021-11-27 10:41:48 +01:00 • committed by Andreas Kling
parent 95c0ec9afc
commit 67f349be46
2 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Userland/Applications/PixelPaint/EditGuideDialog.cpp
View file

@ -29,12 +29,13 @@ EditGuideDialog::EditGuideDialog(GUI::Window* parent_window, String const& offse
auto horizontal_radio = main_widget.find_descendant_of_type_named<GUI::RadioButton>("orientation_horizontal_radio"); auto horizontal_radio = main_widget.find_descendant_of_type_named<GUI::RadioButton>("orientation_horizontal_radio");
auto vertical_radio = main_widget.find_descendant_of_type_named<GUI::RadioButton>("orientation_vertical_radio"); auto vertical_radio = main_widget.find_descendant_of_type_named<GUI::RadioButton>("orientation_vertical_radio");
auto offset_text_box = main_widget.find_descendant_of_type_named<GUI::TextBox>("offset_text_box");
auto ok_button = main_widget.find_descendant_of_type_named<GUI::Button>("ok_button"); auto ok_button = main_widget.find_descendant_of_type_named<GUI::Button>("ok_button");
auto cancel_button = main_widget.find_descendant_of_type_named<GUI::Button>("cancel_button"); auto cancel_button = main_widget.find_descendant_of_type_named<GUI::Button>("cancel_button");
m_offset_text_box = main_widget.find_descendant_of_type_named<GUI::TextBox>("offset_text_box");
VERIFY(horizontal_radio); VERIFY(horizontal_radio);
VERIFY(ok_button); VERIFY(ok_button);
VERIFY(offset_text_box); VERIFY(!m_offset_text_box.is_null());
VERIFY(vertical_radio); VERIFY(vertical_radio);
VERIFY(cancel_button); VERIFY(cancel_button);
@ -47,12 +48,12 @@ EditGuideDialog::EditGuideDialog(GUI::Window* parent_window, String const& offse
} }
if (!offset.is_empty()) if (!offset.is_empty())
offset_text_box->set_text(offset); m_offset_text_box->set_text(offset);
horizontal_radio->on_checked = [this](bool checked) { m_is_horizontal_checked = checked; }; horizontal_radio->on_checked = [this](bool checked) { m_is_horizontal_checked = checked; };
vertical_radio->on_checked = [this](bool checked) { m_is_vertical_checked = checked; }; vertical_radio->on_checked = [this](bool checked) { m_is_vertical_checked = checked; };
ok_button->on_click = [this, &offset_text_box](auto) { ok_button->on_click = [this](auto) {
if (m_is_vertical_checked) { if (m_is_vertical_checked) {
m_orientation = Guide::Orientation::Vertical; m_orientation = Guide::Orientation::Vertical;
} else if (m_is_horizontal_checked) { } else if (m_is_horizontal_checked) {
@ -62,10 +63,10 @@ EditGuideDialog::EditGuideDialog(GUI::Window* parent_window, String const& offse
return; return;
} }
if (offset_text_box->text().is_empty()) if (m_offset_text_box->text().is_empty())
done(ExecResult::ExecAborted); done(ExecResult::ExecAborted);
m_offset = offset_text_box->text(); m_offset = m_offset_text_box->text();
done(ExecResult::ExecOK); done(ExecResult::ExecOK);
}; };

2
Userland/Applications/PixelPaint/EditGuideDialog.h
View file

@ -26,7 +26,7 @@ private:
String m_offset; String m_offset;
Guide::Orientation m_orientation; Guide::Orientation m_orientation;
RefPtr<GUI::TextBox> m_offset_text_box;
bool m_is_horizontal_checked { false }; bool m_is_horizontal_checked { false };
bool m_is_vertical_checked { false }; bool m_is_vertical_checked { false };
}; };