diff --git a/Libraries/LibHTML/ResourceLoader.cpp b/Libraries/LibHTML/ResourceLoader.cpp index 8345c6ca6b..95c8c2106a 100644 --- a/Libraries/LibHTML/ResourceLoader.cpp +++ b/Libraries/LibHTML/ResourceLoader.cpp @@ -8,7 +8,7 @@ ResourceLoader& ResourceLoader::the() { static ResourceLoader* s_the; if (!s_the) - s_the = new ResourceLoader; + s_the = &ResourceLoader::construct().leak_ref(); return *s_the; } @@ -18,13 +18,15 @@ void ResourceLoader::load(const URL& url, Function call auto f = CFile::construct(); f->set_filename(url.path()); if (!f->open(CIODevice::OpenMode::ReadOnly)) { - dbg() << "HtmlView::load: Error: " << f->error_string(); + dbg() << "ResourceLoader::load: Error: " << f->error_string(); callback({}); return; } auto data = f->read_all(); - callback(data); + deferred_invoke([data = move(data), callback = move(callback)](auto&) { + callback(data); + }); return; } diff --git a/Libraries/LibHTML/ResourceLoader.h b/Libraries/LibHTML/ResourceLoader.h index 44df58c751..8255e5a8cd 100644 --- a/Libraries/LibHTML/ResourceLoader.h +++ b/Libraries/LibHTML/ResourceLoader.h @@ -2,8 +2,10 @@ #include #include +#include -class ResourceLoader { +class ResourceLoader : public CObject { + C_OBJECT(ResourceLoader) public: static ResourceLoader& the();