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

Fix #7590: handle script exceptions during scanning

pull/7596/head
glx 2019-05-14 04:32:25 +02:00 committed by glx22
parent aac4255d43
commit a82e7ec281
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/script/script_scanner.cpp
View File

@ -17,6 +17,7 @@
#include "../script/squirrel.hpp" #include "../script/squirrel.hpp"
#include "script_scanner.hpp" #include "script_scanner.hpp"
#include "script_info.hpp" #include "script_info.hpp"
#include "script_fatalerror.hpp"
#include "../network/network_content.h" #include "../network/network_content.h"
#include "../3rdparty/md5/md5.h" #include "../3rdparty/md5/md5.h"
@ -52,8 +53,12 @@ bool ScriptScanner::AddFile(const char *filename, size_t basepath_length, const
if (!FioCheckFileExists(filename, this->subdir) || !FioCheckFileExists(this->main_script, this->subdir)) return false; if (!FioCheckFileExists(filename, this->subdir) || !FioCheckFileExists(this->main_script, this->subdir)) return false;
this->ResetEngine(); this->ResetEngine();
this->engine->LoadScript(filename); try {
this->engine->LoadScript(filename);
} catch (Script_FatalError e) {
DEBUG(script, 0, "Fatal error '%s' when trying to load the script '%s'.", e.GetErrorMessage(), filename);
return false;
}
return true; return true;
} }