From 5120f8b440909d06060a9c68e879a160ffa71b28 Mon Sep 17 00:00:00 2001 From: Leon Styhre <leon@leonstyhre.com> Date: Sun, 5 Nov 2023 15:34:20 +0100 Subject: [PATCH] Fixed a small memory leak in the application updater --- es-app/src/ApplicationUpdater.cpp | 4 ++++ es-app/src/guis/GuiApplicationUpdater.cpp | 2 ++ 2 files changed, 6 insertions(+) diff --git a/es-app/src/ApplicationUpdater.cpp b/es-app/src/ApplicationUpdater.cpp index aaf8f3d10..7524641a4 100644 --- a/es-app/src/ApplicationUpdater.cpp +++ b/es-app/src/ApplicationUpdater.cpp @@ -59,8 +59,11 @@ ApplicationUpdater::~ApplicationUpdater() { // This is needed if getResults() was never called. mApplicationShutdown = true; + if (mThread) mThread->join(); + + HttpReq::cleanupCurlMulti(); } ApplicationUpdater& ApplicationUpdater::getInstance() @@ -187,6 +190,7 @@ void ApplicationUpdater::update() HttpReq::Status reqStatus {mRequest->status()}; if (reqStatus == HttpReq::REQ_SUCCESS) { mStatus = ASYNC_DONE; + HttpReq::cleanupCurlMulti(); return; } diff --git a/es-app/src/guis/GuiApplicationUpdater.cpp b/es-app/src/guis/GuiApplicationUpdater.cpp index c458d19dc..cad6fca54 100644 --- a/es-app/src/guis/GuiApplicationUpdater.cpp +++ b/es-app/src/guis/GuiApplicationUpdater.cpp @@ -227,6 +227,8 @@ GuiApplicationUpdater::~GuiApplicationUpdater() if (mThread) mThread->join(); + + HttpReq::cleanupCurlMulti(); } void GuiApplicationUpdater::setDownloadPath()