From c68ac46d10b7ea328956ba02cf815362de68f8a8 Mon Sep 17 00:00:00 2001 From: momo5502 Date: Mon, 3 Jul 2017 15:22:15 +0200 Subject: [PATCH] [Scheduler] Don't start thread during unit tests --- src/Components/Modules/Scheduler.cpp | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/src/Components/Modules/Scheduler.cpp b/src/Components/Modules/Scheduler.cpp index a851fbec..87642e54 100644 --- a/src/Components/Modules/Scheduler.cpp +++ b/src/Components/Modules/Scheduler.cpp @@ -117,20 +117,23 @@ namespace Components Utils::Hook(0x4D697A, Scheduler::ShutdownStub, HOOK_CALL).install()->quick(); - Scheduler::AsyncTerminate = false; - Scheduler::AsyncThread = std::thread([]() + if (!Loader::PerformUnitTests()) { - while (!Scheduler::AsyncTerminate) + Scheduler::AsyncTerminate = false; + Scheduler::AsyncThread = std::thread([]() { - Scheduler::AsyncFrameSignal(); + while (!Scheduler::AsyncTerminate) + { + Scheduler::AsyncFrameSignal(); - Utils::Signal copy(Scheduler::AsyncFrameOnceSignal); - Scheduler::AsyncFrameOnceSignal.clear(); - copy(); + Utils::Signal copy(Scheduler::AsyncFrameOnceSignal); + Scheduler::AsyncFrameOnceSignal.clear(); + copy(); - std::this_thread::sleep_for(16ms); - } - }); + std::this_thread::sleep_for(16ms); + } + }); + } } Scheduler::~Scheduler()