From 732576b1906c718217c8eeea93cd7856bc561de9 Mon Sep 17 00:00:00 2001
From: Aang23 <qwerty15@gmx.fr>
Date: Wed, 24 Dec 2025 17:45:14 +0100
Subject: [PATCH] Properly delete processing handler on error

---
 src-core/core/plugin.cpp                    | 3 ++-
 src-core/handlers/processing/processing.cpp | 7 ++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src-core/core/plugin.cpp b/src-core/core/plugin.cpp
index 0c06758ea..cb3302622 100644
--- a/src-core/core/plugin.cpp
+++ b/src-core/core/plugin.cpp
@@ -52,7 +52,8 @@ void loadPlugins(std::map<std::string, std::shared_ptr<satdump::Plugin>> &loaded
 #else
     if (std::filesystem::exists("plugins")) // Try local plugins directory first
         plugins_paths.push_back("./plugins");
-    if (std::filesystem::exists(satdump::LIBPATH + "plugins")) // Followed by system
+    if (std::filesystem::exists(satdump::LIBPATH + "plugins") && // Followed by system
+        std::filesystem::absolute(satdump::LIBPATH + "plugins") != std::filesystem::absolute("./plugins"))
         plugins_paths.push_back(satdump::LIBPATH + "plugins");
 #endif
 
diff --git a/src-core/handlers/processing/processing.cpp b/src-core/handlers/processing/processing.cpp
index 467ed52f0..ef732820d 100644
--- a/src-core/handlers/processing/processing.cpp
+++ b/src-core/handlers/processing/processing.cpp
@@ -69,7 +69,7 @@ namespace satdump
             catch (std::exception &e)
             {
                 logger->error("Fatal error running pipeline : " + std::string(e.what()));
-                return;
+                goto exit_handler;
             }
 
             logger->info("Done! Goodbye");
@@ -91,9 +91,10 @@ namespace satdump
                 }
             }
 
-            pipeline_name = "PROCESSING_DONE"; // TODOREWORK MASSIVE HACK!
-
             eventBus->fire_event<SetIsDoneProcessingEvent>({});
+
+        exit_handler:
+            pipeline_name = "PROCESSING_DONE"; // TODOREWORK MASSIVE HACK!
         }
 
         void OffProcessingHandler::drawMenu() {}