RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 12:27:35 +00:00
Code Issues Activity Actions

GMLPlayground: Keep a RefPtr to the "Save As..." action

Browse source 
Previously, the Save action held a reference to the local variable for
the Save As action, which goes out of scope at the end of
`initialize_menubar()`. This meant that if you tried to Save a new
file, it would instead crash and yeet your work into the abyss.
This commit is contained in:
Sam Atkins 2023-07-19 15:03:47 +01:00 • committed by Sam Atkins
parent e02b2a7b9a
commit ca3e0288e9
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Userland/DevTools/GMLPlayground/MainWidget.cpp
View file

@ -136,7 +136,7 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
{ {
auto file_menu = TRY(window.try_add_menu("&File"_short_string)); auto file_menu = TRY(window.try_add_menu("&File"_short_string));
auto save_as_action = GUI::CommonActions::make_save_as_action([&](auto&) { m_save_as_action = GUI::CommonActions::make_save_as_action([&](auto&) {
LexicalPath initial_path(m_file_path.is_empty() ? "Untitled.gml" : m_file_path); LexicalPath initial_path(m_file_path.is_empty() ? "Untitled.gml" : m_file_path);
auto response = FileSystemAccessClient::Client::the().save_file(&window, initial_path.title(), initial_path.extension()); auto response = FileSystemAccessClient::Client::the().save_file(&window, initial_path.title(), initial_path.extension());
if (response.is_error()) if (response.is_error())
@ -155,7 +155,7 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
m_save_action = GUI::CommonActions::make_save_action([&](auto&) { m_save_action = GUI::CommonActions::make_save_action([&](auto&) {
if (m_file_path.is_empty()) { if (m_file_path.is_empty()) {
save_as_action->activate(); m_save_as_action->activate();
return; return;
} }
auto response = FileSystemAccessClient::Client::the().request_file(&window, m_file_path, Core::File::OpenMode::Truncate | Core::File::OpenMode::Write); auto response = FileSystemAccessClient::Client::the().request_file(&window, m_file_path, Core::File::OpenMode::Truncate | Core::File::OpenMode::Write);
@ -189,7 +189,7 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
TRY(file_menu->try_add_action(open_action)); TRY(file_menu->try_add_action(open_action));
TRY(file_menu->try_add_action(*m_save_action)); TRY(file_menu->try_add_action(*m_save_action));
TRY(file_menu->try_add_action(save_as_action)); TRY(file_menu->try_add_action(*m_save_as_action));
TRY(file_menu->try_add_separator()); TRY(file_menu->try_add_separator());
TRY(file_menu->add_recent_files_list([&](auto& action) { TRY(file_menu->add_recent_files_list([&](auto& action) {
@ -281,7 +281,7 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
(void)TRY(m_toolbar->try_add_action(open_action)); (void)TRY(m_toolbar->try_add_action(open_action));
(void)TRY(m_toolbar->try_add_action(*m_save_action)); (void)TRY(m_toolbar->try_add_action(*m_save_action));
(void)TRY(m_toolbar->try_add_action(save_as_action)); (void)TRY(m_toolbar->try_add_action(*m_save_as_action));
TRY(m_toolbar->try_add_separator()); TRY(m_toolbar->try_add_separator());
(void)TRY(m_toolbar->try_add_action(m_editor->cut_action())); (void)TRY(m_toolbar->try_add_action(m_editor->cut_action()));
(void)TRY(m_toolbar->try_add_action(m_editor->copy_action())); (void)TRY(m_toolbar->try_add_action(m_editor->copy_action()));

1
Userland/DevTools/GMLPlayground/MainWidget.h
View file

@ -35,6 +35,7 @@ private:
virtual void drop_event(GUI::DropEvent&) override; virtual void drop_event(GUI::DropEvent&) override;
RefPtr<GUI::Action> m_save_action; RefPtr<GUI::Action> m_save_action;
RefPtr<GUI::Action> m_save_as_action;
RefPtr<GUI::TextEditor> m_editor; RefPtr<GUI::TextEditor> m_editor;
RefPtr<GUI::Toolbar> m_toolbar; RefPtr<GUI::Toolbar> m_toolbar;
RefPtr<GUI::Splitter> m_splitter; RefPtr<GUI::Splitter> m_splitter;