mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r2908) If threaded saving fails or does not happen, sending subsequent messages might hang ottd. So don't send them :)

release/0.4.5
Darkvater 2005-09-02 22:22:02 +00:00
parent d05f504c01
commit 92270500e9
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
saveload.c
View File

@ -1283,6 +1283,8 @@ void SaveFileError(void)
SaveFileDone(); SaveFileDone();
} }
static Thread* save_thread;
/** We have written the whole game into memory, _save_pool, now find /** We have written the whole game into memory, _save_pool, now find
* and appropiate compressor and start writing to file. * and appropiate compressor and start writing to file.
*/ */
@ -1294,7 +1296,7 @@ static void* SaveFileToDisk(void *arg)
static byte *tmp = NULL; static byte *tmp = NULL;
uint32 hdr[2]; uint32 hdr[2];
OTTD_SendThreadMessage(MSG_OTTD_SAVETHREAD_START); if (save_thread != NULL) OTTD_SendThreadMessage(MSG_OTTD_SAVETHREAD_START);
tmp = _sl.buf; tmp = _sl.buf;
@ -1341,13 +1343,10 @@ static void* SaveFileToDisk(void *arg)
GetSavegameFormat("memory")->uninit_write(); // clean the memorypool GetSavegameFormat("memory")->uninit_write(); // clean the memorypool
fclose(_sl.fh); fclose(_sl.fh);
OTTD_SendThreadMessage(MSG_OTTD_SAVETHREAD_DONE); if (save_thread != NULL) OTTD_SendThreadMessage(MSG_OTTD_SAVETHREAD_DONE);
return NULL; return NULL;
} }
static Thread* save_thread;
void WaitTillSaved(void) void WaitTillSaved(void)
{ {
OTTDJoinThread(save_thread); OTTDJoinThread(save_thread);
@ -1413,7 +1412,7 @@ SaveOrLoadResult SaveOrLoad(const char *filename, int mode)
ShowInfoF("Load game failed: %s.", _sl.excpt_msg); ShowInfoF("Load game failed: %s.", _sl.excpt_msg);
return SL_REINIT; return SL_REINIT;
} }
ShowInfoF("Save game failed: %s.", _sl.excpt_msg); ShowInfoF("Save game failed: %s.", _sl.excpt_msg);
return SL_ERROR; return SL_ERROR;
} }