diff --git a/Userland/Libraries/LibWebView/InspectorClient.cpp b/Userland/Libraries/LibWebView/InspectorClient.cpp index 93e3e7a6f12..9e3fcd7ccad 100644 --- a/Userland/Libraries/LibWebView/InspectorClient.cpp +++ b/Userland/Libraries/LibWebView/InspectorClient.cpp @@ -12,9 +12,9 @@ #include #include #include -#include #include #include +#include #include #include @@ -220,9 +220,16 @@ InspectorClient::InspectorClient(ViewImplementation& content_web_view, ViewImple }; m_inspector_web_view.on_inspector_exported_inspector_html = [this](String const& html) { - auto inspector_path = LexicalPath::join(Core::StandardPaths::downloads_directory(), "inspector"sv); + auto maybe_inspector_path = Application::the().path_for_downloaded_file("inspector"sv); - if (auto result = Core::Directory::create(inspector_path, Core::Directory::CreateDirectories::Yes); result.is_error()) { + if (maybe_inspector_path.is_error()) { + append_console_warning(MUST(String::formatted("Unable to select a download location: {}", maybe_inspector_path.error()))); + return; + } + + auto inspector_path = maybe_inspector_path.release_value(); + + if (auto result = Core::Directory::create(inspector_path.string(), Core::Directory::CreateDirectories::Yes); result.is_error()) { append_console_warning(MUST(String::formatted("Unable to create {}: {}", inspector_path, result.error()))); return; } diff --git a/Userland/Libraries/LibWebView/ViewImplementation.cpp b/Userland/Libraries/LibWebView/ViewImplementation.cpp index 83f2f7ba59e..2d8a0531327 100644 --- a/Userland/Libraries/LibWebView/ViewImplementation.cpp +++ b/Userland/Libraries/LibWebView/ViewImplementation.cpp @@ -11,6 +11,7 @@ #include #include #include +#include #include #ifdef AK_OS_MACOS @@ -510,8 +511,8 @@ static ErrorOr save_screenshot(Gfx::ShareableBitmap const& bitmap) if (!bitmap.is_valid()) return Error::from_string_view("Failed to take a screenshot"sv); - LexicalPath path { Core::StandardPaths::downloads_directory() }; - path = path.append(TRY(Core::DateTime::now().to_string("screenshot-%Y-%m-%d-%H-%M-%S.png"sv))); + auto file = Core::DateTime::now().to_byte_string("screenshot-%Y-%m-%d-%H-%M-%S.png"sv); + auto path = TRY(Application::the().path_for_downloaded_file(file)); auto encoded = TRY(Gfx::PNGWriter::encode(*bitmap.bitmap()));