From 5c29b45d1d42ecab89088db2b5409bc2d6e4ad03 Mon Sep 17 00:00:00 2001 From: Lucas CHOLLET Date: Fri, 5 May 2023 00:28:07 -0400 Subject: [PATCH] LibGUI: Make `Clipboard::initialize` propagate errors --- Userland/Libraries/LibGUI/Application.cpp | 2 +- Userland/Libraries/LibGUI/Clipboard.cpp | 5 +++-- Userland/Libraries/LibGUI/Clipboard.h | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Userland/Libraries/LibGUI/Application.cpp b/Userland/Libraries/LibGUI/Application.cpp index cbb4403493..990c0a48c9 100644 --- a/Userland/Libraries/LibGUI/Application.cpp +++ b/Userland/Libraries/LibGUI/Application.cpp @@ -79,7 +79,7 @@ ErrorOr> Application::create(Main::Arguments const& a application->m_event_loop = TRY(try_make()); ConnectionToWindowServer::the(); - Clipboard::initialize({}); + TRY(Clipboard::initialize({})); if (arguments.argc > 0) application->m_invoked_as = arguments.argv[0]; diff --git a/Userland/Libraries/LibGUI/Clipboard.cpp b/Userland/Libraries/LibGUI/Clipboard.cpp index 0c219bafbe..54e1cdcc59 100644 --- a/Userland/Libraries/LibGUI/Clipboard.cpp +++ b/Userland/Libraries/LibGUI/Clipboard.cpp @@ -37,9 +37,10 @@ static ConnectionToClipboardServer& connection() return *s_connection; } -void Clipboard::initialize(Badge) +ErrorOr Clipboard::initialize(Badge) { - s_connection = ConnectionToClipboardServer::try_create().release_value_but_fixme_should_propagate_errors(); + s_connection = TRY(ConnectionToClipboardServer::try_create()); + return {}; } Clipboard& Clipboard::the() diff --git a/Userland/Libraries/LibGUI/Clipboard.h b/Userland/Libraries/LibGUI/Clipboard.h index 18fbe33e43..7b2e8a3718 100644 --- a/Userland/Libraries/LibGUI/Clipboard.h +++ b/Userland/Libraries/LibGUI/Clipboard.h @@ -36,7 +36,7 @@ public: RefPtr as_bitmap() const; }; - static void initialize(Badge); + static ErrorOr initialize(Badge); static Clipboard& the(); DataAndType fetch_data_and_type() const;