MoNTE48
/
Minetest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Server::step throw is never catched. Replace it with an errorstream + assert" 

This reverts commit 5f8e48c63b.
master
kwolekr 2015-03-16 21:17:27 -04:00
parent ceac41ed6e
commit 699d42efc6
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/server.cpp
View File

@ -479,13 +479,10 @@ void Server::step(float dtime)
JMutexAutoLock lock(m_step_dtime_mutex); JMutexAutoLock lock(m_step_dtime_mutex);
m_step_dtime += dtime; m_step_dtime += dtime;
} }
// Assert if fatal error occurred in thread // Throw if fatal error occurred in thread
std::string async_err = m_async_fatal_error.get(); std::string async_err = m_async_fatal_error.get();
if(async_err != "") { if(async_err != ""){
errorstream << "UNRECOVERABLE error occurred. Stopping server. " throw ServerError(async_err);
<< "Please fix the following error:" << std::endl
<< async_err << std::endl;
assert(false);
} }
} }