From b9fe38782d0df73e101276e33ed4f9a51431421c Mon Sep 17 00:00:00 2001 From: Guillaume Jacquemin Date: Sun, 14 Apr 2024 18:30:39 +0200 Subject: [PATCH] Configuration: avoid a deadlock. --- src/Configuration/Configuration.cpp | 4 ---- src/main.cpp | 5 ++++- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/Configuration/Configuration.cpp b/src/Configuration/Configuration.cpp index 01d256b..f2c8887 100644 --- a/src/Configuration/Configuration.cpp +++ b/src/Configuration/Configuration.cpp @@ -25,7 +25,6 @@ #include #include "../Logger/Logger.h" -#include "../Utilities/Temp.h" #include "Configuration.h" @@ -169,9 +168,6 @@ Configuration::Configuration() { return; } } - else { - Utilities::emptyTempDir(); - } _valid = true; } diff --git a/src/main.cpp b/src/main.cpp index 14142cb..89d3227 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -22,9 +22,10 @@ #include #include +#include "Application/Application.h" #include "Configuration/Configuration.h" #include "Logger/MagnumLogBuffer.h" -#include "Application/Application.h" +#include "Utilities/Temp.h" int main(int argc, char** argv) { MagnumLogBuffer debug_intercept_buffer{EntryType::Info}; @@ -48,6 +49,8 @@ int main(int argc, char** argv) { return EXIT_FAILURE; } + mbst::Utilities::emptyTempDir(); + auto str = setlocale(LC_ALL, ".utf-8"); if(str) { Containers::StringView locale{str};