diff options
| author | est31 <MTest31@outlook.com> | 2015-10-26 04:13:27 +0100 |
|---|---|---|
| committer | est31 <MTest31@outlook.com> | 2015-10-26 04:45:00 +0100 |
| commit | 5f342aa0154e59503fbb22e46ac95ef655aaad1a (patch) | |
| tree | b476f7a5e4d7b4f09ecd514af2c82484e5f8c132 /src/script | |
| parent | d69ef6acd386ccfd5ff456002591b97b92a26956 (diff) | |
| download | minetest-5f342aa0154e59503fbb22e46ac95ef655aaad1a.tar.gz minetest-5f342aa0154e59503fbb22e46ac95ef655aaad1a.tar.bz2 minetest-5f342aa0154e59503fbb22e46ac95ef655aaad1a.zip | |
Remove some abort() calls
abort() doesn't benefit from the high level abstractions from FATAL_ERROR.
Diffstat (limited to 'src/script')
| -rw-r--r-- | src/script/cpp_api/s_async.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/script/cpp_api/s_async.cpp b/src/script/cpp_api/s_async.cpp index d18ff6e8c..171632633 100644 --- a/src/script/cpp_api/s_async.cpp +++ b/src/script/cpp_api/s_async.cpp @@ -244,17 +244,14 @@ void* AsyncWorkerThread::run() std::string script = getServer()->getBuiltinLuaPath() + DIR_DELIM + "init.lua"; if (!loadScript(script)) { - errorstream << "execution of async base environment failed!" - << std::endl; - abort(); + FATAL_ERROR("execution of async base environment failed!"); } int error_handler = PUSH_ERROR_HANDLER(L); lua_getglobal(L, "core"); if (lua_isnil(L, -1)) { - errorstream << "Unable to find core within async environment!"; - abort(); + FATAL_ERROR("Unable to find core within async environment!"); } // Main loop @@ -268,8 +265,7 @@ void* AsyncWorkerThread::run() lua_getfield(L, -1, "job_processor"); if (lua_isnil(L, -1)) { - errorstream << "Unable to get async job processor!" << std::endl; - abort(); + FATAL_ERROR("Unable to get async job processor!"); } luaL_checktype(L, -1, LUA_TFUNCTION); |