From a6c70b7fa89aadbccd6cc1b238b0529e177aaedd Mon Sep 17 00:00:00 2001 From: DolphyWind Date: Fri, 26 May 2023 22:23:51 +0300 Subject: [PATCH] Update safe_exit Apparently the destructor of a static object gets called on std::exit --- include/Argparser.hpp | 2 +- include/Electra.hpp | 3 --- src/Electra.cpp | 20 +------------------- 3 files changed, 2 insertions(+), 23 deletions(-) diff --git a/include/Argparser.hpp b/include/Argparser.hpp index a584752..3e8c897 100644 --- a/include/Argparser.hpp +++ b/include/Argparser.hpp @@ -26,7 +26,7 @@ SOFTWARE. #define ELECTRA_VERSION_MAJOR 2 #define ELECTRA_VERSION_MINOR 0 -#define ELECTRA_VERSION_PATCH 2 +#define ELECTRA_VERSION_PATCH 4 #include #include diff --git a/include/Electra.hpp b/include/Electra.hpp index e8c1feb..5778500 100644 --- a/include/Electra.hpp +++ b/include/Electra.hpp @@ -154,9 +154,6 @@ class Electra /// - Create new currents void mainLoop(); - /// @brief cleans up maps, vectors etc. - void cleanup(); - /// @brief Safely exits the program void safe_exit(int exit_code); diff --git a/src/Electra.cpp b/src/Electra.cpp index cfbbb9d..163c2b4 100644 --- a/src/Electra.cpp +++ b/src/Electra.cpp @@ -298,7 +298,7 @@ Electra &Electra::instance() Electra::~Electra() { - cleanup(); + } void Electra::run() @@ -331,26 +331,8 @@ void Electra::mainLoop() defaultlogger.log(LogType::INFO, L"Program finished. Total ticks: {}", tickCount); } -void Electra::cleanup() -{ - m_components.clear(); - m_generatorDataMap.clear(); - m_generatorChars.clear(); - m_generators.clear(); - m_currents.clear(); - m_filename.clear(); - m_currentPath.clear(); - m_sourceCode.clear(); - m_includedParts.clear(); - m_deadCurrentIndexes.clear(); - m_newCurrents.clear(); - m_stacks.clear(); - m_portalMap.clear(); -} - void Electra::safe_exit(int exit_code) { - cleanup(); std::exit(exit_code); }