petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

(svn r22820) -Codechange: perform a full (re)draw cycle in the first draw during progress instead of waiting 200ms

Browse Source
This commit is contained in:
rubidium
2011-08-24 12:18:53 +00:00
parent 38ad276acc
commit 70179db81e
6 changed files with 32 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/newgrf_config.cpp
View File

@@ -629,14 +629,7 @@ static int CDECL GRFSorter(GRFConfig * const *p1, GRFConfig * const *p2)
*/
void DoScanNewGRFFiles(void *callback)
{
/* First set the modal progress. This ensures that it will eventually let go of the paint mutex. */
SetModalProgress(true);
_modal_progress_paint_mutex->BeginCritical();
/* Only then can we really start, especially by marking the whole screen dirty. Get those other windows hidden!. */
MarkWholeScreenDirty();
_modal_progress_work_mutex->BeginCritical();
_modal_progress_paint_mutex->EndCritical();
ClearGRFConfigList(&_all_grfs);
@@ -694,12 +687,19 @@ void DoScanNewGRFFiles(void *callback)
*/
void ScanNewGRFFiles(NewGRFScanCallback *callback)
{
/* First set the modal progress. This ensures that it will eventually let go of the paint mutex. */
SetModalProgress(true);
/* Only then can we really start, especially by marking the whole screen dirty. Get those other windows hidden!. */
MarkWholeScreenDirty();
if (!_video_driver->HasGUI() || !ThreadObject::New(&DoScanNewGRFFiles, callback, NULL)) {
_modal_progress_work_mutex->EndCritical();
_modal_progress_paint_mutex->EndCritical();
DoScanNewGRFFiles(callback);
_modal_progress_paint_mutex->BeginCritical();
_modal_progress_work_mutex->BeginCritical();
} else {
UpdateNewGRFScanStatus(0, NULL);
}
}