From 9fe4b959ac90c91185ea0974f9a4d16091b0d3aa Mon Sep 17 00:00:00 2001 From: rubidium Date: Wed, 24 Aug 2011 12:11:10 +0000 Subject: (svn r22818) -Fix [FS#4742] (r22796, rlongago): don't spawn threads for world generation and NewGRF scanning when using the dedicated or null video driver regardless of the used blitter --- src/newgrf_config.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/newgrf_config.cpp') diff --git a/src/newgrf_config.cpp b/src/newgrf_config.cpp index c8385aca4..693339182 100644 --- a/src/newgrf_config.cpp +++ b/src/newgrf_config.cpp @@ -19,8 +19,7 @@ #include "window_func.h" #include "progress.h" #include "thread/thread.h" -#include "blitter/factory.hpp" -#include "network/network.h" +#include "video/video_driver.hpp" #include "fileio_func.h" #include "fios.h" @@ -696,7 +695,7 @@ void DoScanNewGRFFiles(void *callback) */ void ScanNewGRFFiles(NewGRFScanCallback *callback) { - if (BlitterFactoryBase::GetCurrentBlitter()->GetScreenDepth() == 0 || _network_dedicated || !ThreadObject::New(&DoScanNewGRFFiles, callback, NULL)) { + if (!_video_driver->HasGUI() || !ThreadObject::New(&DoScanNewGRFFiles, callback, NULL)) { _modal_progress_work_mutex->EndCritical(); _modal_progress_paint_mutex->EndCritical(); DoScanNewGRFFiles(callback); -- cgit v1.2.3-54-g00ecf