Fixed up merge issues and crash

2022-07-11 18:52:48 -04:00
parent 0193489b00
commit 44bf5af33a
3 changed files with 104 additions and 62 deletions
--- a/ZAPDTR/ZAPD/Globals.cpp
+++ b/ZAPDTR/ZAPD/Globals.cpp
@@ -23,7 +23,6 @@ Globals::Globals()
 	singleThreaded = true;
 	verbosity = VerbosityLevel::VERBOSITY_SILENT;
 	outputPath = Directory::GetCurrentDirectory();
-	singleThreaded = true;
 }

 Globals::~Globals()