Configuration: avoid a deadlock.
This commit is contained in:
parent
028d991b74
commit
b9fe38782d
2 changed files with 4 additions and 5 deletions
|
@ -25,7 +25,6 @@
|
||||||
#include <shlobj.h>
|
#include <shlobj.h>
|
||||||
|
|
||||||
#include "../Logger/Logger.h"
|
#include "../Logger/Logger.h"
|
||||||
#include "../Utilities/Temp.h"
|
|
||||||
|
|
||||||
#include "Configuration.h"
|
#include "Configuration.h"
|
||||||
|
|
||||||
|
@ -169,9 +168,6 @@ Configuration::Configuration() {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
|
||||||
Utilities::emptyTempDir();
|
|
||||||
}
|
|
||||||
|
|
||||||
_valid = true;
|
_valid = true;
|
||||||
}
|
}
|
||||||
|
|
|
@ -22,9 +22,10 @@
|
||||||
#include <synchapi.h>
|
#include <synchapi.h>
|
||||||
#include <winerror.h>
|
#include <winerror.h>
|
||||||
|
|
||||||
|
#include "Application/Application.h"
|
||||||
#include "Configuration/Configuration.h"
|
#include "Configuration/Configuration.h"
|
||||||
#include "Logger/MagnumLogBuffer.h"
|
#include "Logger/MagnumLogBuffer.h"
|
||||||
#include "Application/Application.h"
|
#include "Utilities/Temp.h"
|
||||||
|
|
||||||
int main(int argc, char** argv) {
|
int main(int argc, char** argv) {
|
||||||
MagnumLogBuffer debug_intercept_buffer{EntryType::Info};
|
MagnumLogBuffer debug_intercept_buffer{EntryType::Info};
|
||||||
|
@ -48,6 +49,8 @@ int main(int argc, char** argv) {
|
||||||
return EXIT_FAILURE;
|
return EXIT_FAILURE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
mbst::Utilities::emptyTempDir();
|
||||||
|
|
||||||
auto str = setlocale(LC_ALL, ".utf-8");
|
auto str = setlocale(LC_ALL, ".utf-8");
|
||||||
if(str) {
|
if(str) {
|
||||||
Containers::StringView locale{str};
|
Containers::StringView locale{str};
|
||||||
|
|
Loading…
Reference in a new issue