Skip to content
Permalink
Browse files

add. 17688ff for HL

  • Loading branch information...
rt
rt committed May 4, 2019
1 parent 56c7352 commit 07dc87b8a538cdebd1deca2eba577c56ceead7ee
Showing with 2 additions and 4 deletions.
  1. +2 −4 rts/System/SpringApp.cpp
@@ -320,7 +320,6 @@ bool SpringApp::InitFileSystem()
// (employ all available threads, then switch to default)
ThreadPool::SetMaximumThreadCount();

#ifndef HEADLESS
// threaded initialization s.t. the window gets CPU time
// FileSystem is mostly self-contained, don't need locks
// (at this point neither the platform CWD nor data-dirs
@@ -331,6 +330,7 @@ bool SpringApp::InitFileSystem()
std::vector<std::string> splashScreenFiles(dataDirsAccess.FindFiles(FileSystem::IsAbsolutePath(ssd)? ssd: cwd + ssd, "*.{png,jpg}", 0));
spring::thread fsInitThread(FileSystemInitializer::InitializeThr, &ret);

#ifndef HEADLESS
if (!splashScreenFiles.empty()) {
ShowSplashScreen(splashScreenFiles[ guRNG.NextInt(splashScreenFiles.size()) ], SpringVersion::GetFull(), [&]() { return (FileSystemInitializer::Initialized()); });
} else {
@@ -340,11 +340,9 @@ bool SpringApp::InitFileSystem()
// skip hangs while waiting for the popup to die and kill us
if (!ret)
Watchdog::DeregisterThread(WDT_MAIN);
#endif

fsInitThread.join();
#else
FileSystemInitializer::InitializeThr(&ret);
#endif

ThreadPool::SetDefaultThreadCount();
// see InputHandler::PushEvents

0 comments on commit 07dc87b

Please sign in to comment.
You can’t perform that action at this time.