RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 14:07:46 +00:00
Code Issues Activity Actions

DisplaySettings: Fix crash on exit (due to Core::Object on the stack)

Browse source
This commit is contained in:
Andreas Kling 2020-07-05 21:17:14 +02:00
parent 244fe1089c
commit e8a59ef842
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Applications/DisplaySettings/DisplaySettings.h
View file

@ -31,7 +31,7 @@
#include <LibGUI/ComboBox.h> #include <LibGUI/ComboBox.h>
class DisplaySettingsWidget : public GUI::Widget { class DisplaySettingsWidget : public GUI::Widget {
C_OBJECT(MonitorWidget); C_OBJECT(DisplaySettingsWidget);
public: public:
DisplaySettingsWidget(); DisplaySettingsWidget();

5
Applications/DisplaySettings/main.cpp
View file

@ -50,14 +50,15 @@ int main(int argc, char** argv)
return 1; return 1;
} }
DisplaySettingsWidget instance; // FIXME: Clean up this bizarre object graph
auto instance = DisplaySettingsWidget::construct();
auto window = GUI::Window::construct(); auto window = GUI::Window::construct();
window->set_title("Display settings"); window->set_title("Display settings");
window->move_to(100, 100); window->move_to(100, 100);
window->resize(360, 390); window->resize(360, 390);
window->set_resizable(false); window->set_resizable(false);
window->set_main_widget(instance.root_widget()); window->set_main_widget(instance->root_widget());
window->set_icon(Gfx::Bitmap::load_from_file("/res/icons/16x16/app-display-settings.png")); window->set_icon(Gfx::Bitmap::load_from_file("/res/icons/16x16/app-display-settings.png"));
auto menubar = GUI::MenuBar::construct(); auto menubar = GUI::MenuBar::construct();