diff options
| author | Steve Melenchuk <smelenchuk@gmail.com> | 2014-04-06 17:04:58 -0600 |
|---|---|---|
| committer | Steve Melenchuk <smelenchuk@gmail.com> | 2014-04-06 17:07:39 -0600 |
| commit | 2e1702711870b93c623b37ec4aed4bad5d307116 (patch) | |
| tree | e89a59958c6911b3c159941c03c1d08b09f250c9 /crawl-ref/source/database.cc | |
| parent | 44c3f01e58d1dae5f5d98f71e62038fc367b6722 (diff) | |
| download | crawl-ref-2e1702711870b93c623b37ec4aed4bad5d307116.tar.gz crawl-ref-2e1702711870b93c623b37ec4aed4bad5d307116.zip | |
Disable multithreaded loading on Windows (#5354).
Until we can identify why it randomly fails to find files, we should not
have the game crash on startup.
Diffstat (limited to 'crawl-ref/source/database.cc')
| -rw-r--r-- | crawl-ref/source/database.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/crawl-ref/source/database.cc b/crawl-ref/source/database.cc index 7186b953d2..e08969f60c 100644 --- a/crawl-ref/source/database.cc +++ b/crawl-ref/source/database.cc @@ -316,7 +316,7 @@ void TextDB::_regenerate_db() // DB system // ---------------------------------------------------------------------- -#ifndef DGAMELAUNCH +#if !defined(DGAMELAUNCH) && !defined(TARGET_OS_WINDOWS) static void* init_db(void *arg) { AllDBs[(intptr_t)arg].init(); @@ -335,7 +335,10 @@ void databaseSystemInit() thread_t th[NUM_DB]; for (unsigned int i = 0; i < NUM_DB; i++) -#ifndef DGAMELAUNCH +// Using threads for loading on Windows at the moment seems to cause +// random failures to find files (#5854); thus disabling it here until +// we can identify what's going on. +#if !defined(DGAMELAUNCH) && !defined(TARGET_OS_WINDOWS) if (thread_create_joinable(&th[i], init_db, (void*)(intptr_t)i)) #endif { |