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

Mail: Propagate errors using try_set_main_widget in main

Browse source
This commit is contained in:
creator1creeper1 2022-01-07 15:06:17 +01:00 • committed by Andreas Kling
parent a76e97df64
commit f17bd66ecc
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Userland/Applications/Mail/main.cpp
View file

@ -40,7 +40,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
auto app_icon = GUI::Icon::default_icon("app-mail"); auto app_icon = GUI::Icon::default_icon("app-mail");
window->set_icon(app_icon.bitmap_for_size(16)); window->set_icon(app_icon.bitmap_for_size(16));
auto& mail_widget = window->set_main_widget<MailWidget>(); auto mail_widget = TRY(window->try_set_main_widget<MailWidget>());
window->set_title("Mail"); window->set_title("Mail");
window->resize(640, 400); window->resize(640, 400);
@ -48,7 +48,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
auto& file_menu = window->add_menu("&File"); auto& file_menu = window->add_menu("&File");
file_menu.add_action(GUI::CommonActions::make_quit_action([&](auto&) { file_menu.add_action(GUI::CommonActions::make_quit_action([&](auto&) {
mail_widget.on_window_close(); mail_widget->on_window_close();
app->quit(); app->quit();
})); }));
@ -56,13 +56,13 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
help_menu.add_action(GUI::CommonActions::make_about_action("Mail", app_icon, window)); help_menu.add_action(GUI::CommonActions::make_about_action("Mail", app_icon, window));
window->on_close_request = [&] { window->on_close_request = [&] {
mail_widget.on_window_close(); mail_widget->on_window_close();
return GUI::Window::CloseRequestDecision::Close; return GUI::Window::CloseRequestDecision::Close;
}; };
window->show(); window->show();
bool should_continue = mail_widget.connect_and_login(); bool should_continue = mail_widget->connect_and_login();
if (!should_continue) if (!should_continue)
return 1; return 1;