LadybirdBrowser/ladybird
1
1
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-13 11:42:38 +03:00
Code Issues Packages Projects Releases Wiki Activity

Terminal: Fix trying to free() a stack variable

Browse Source 
GWindow::~GWindow() deletes the main widget, assuming it was
allocated with new; this is what all other applications do,
so heap-allocate the terminal widget as well even though it's
not necessary in this case.
This commit is contained in:
Sergey Bugaev 2019-08-06 12:42:13 +03:00 committed by Andreas Kling
parent 2ad963d261
commit 9de48cd81a
Notes: sideshowbarker 2024-07-19 12:51:26 +09:00 
Author: https://github.com/bugaevc
Commit: https://github.com/SerenityOS/serenity/commit/9de48cd81a2
Pull-request: https://github.com/SerenityOS/serenity/pull/412
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Applications/Terminal/main.cpp
View File

@ -150,27 +150,27 @@ int main(int argc, char** argv)
window->set_double_buffering_enabled(false);
RefPtr<CConfigFile> config = CConfigFile::get_for_app("Terminal");
Terminal terminal(ptm_fd, config);
auto* terminal = new Terminal(ptm_fd, config);
window->set_has_alpha_channel(true);
window->set_main_widget(&terminal);
window->set_main_widget(terminal);
window->move_to(300, 300);
terminal.apply_size_increments_to_window(*window);
terminal->apply_size_increments_to_window(*window);
window->show();
window->set_icon(load_png("/res/icons/16x16/app-terminal.png"));
terminal.set_should_beep(config->read_bool_entry("Window", "AudibleBeep", false));
terminal->set_should_beep(config->read_bool_entry("Window", "AudibleBeep", false));
WeakPtr<GWindow> settings_window;
auto new_opacity = config->read_num_entry("Window", "Opacity", 255);
terminal.set_opacity(new_opacity);
terminal->set_opacity(new_opacity);
auto menubar = make<GMenuBar>();
auto app_menu = make<GMenu>("Terminal");
app_menu->add_action(GAction::create("Settings...",
[&settings_window, &terminal, &config](const GAction&) {
[&settings_window, terminal, &config](const GAction&) {
if (!settings_window)
settings_window = create_settings_window(terminal, config)->make_weak_ptr();
settings_window = create_settings_window(*terminal, config)->make_weak_ptr();
settings_window->show();
settings_window->move_to_front();
}));
@ -183,13 +183,13 @@ int main(int argc, char** argv)
auto font_menu = make<GMenu>("Font");
GFontDatabase::the().for_each_fixed_width_font([&](const StringView& font_name) {
font_menu->add_action(GAction::create(font_name, [&terminal, &config](const GAction& action) {
terminal.set_font(GFontDatabase::the().get_by_name(action.text()));
font_menu->add_action(GAction::create(font_name, [terminal, &config](const GAction& action) {
terminal->set_font(GFontDatabase::the().get_by_name(action.text()));
auto metadata = GFontDatabase::the().get_metadata_by_name(action.text());
ASSERT(metadata.has_value());
config->write_entry("Text", "Font", metadata.value().path);
config->sync();
terminal.force_repaint();
terminal->force_repaint();
}));
});
menubar->add_menu(move(font_menu));