Skip to content
Permalink
Browse files

Revert "Server::step throw is never catched. Replace it with an error…

…stream + assert"

This reverts commit 5f8e48c.
  • Loading branch information
kwolekr committed Mar 17, 2015
1 parent ceac41e commit 699d42efc64cb1e317efbdf21dd55fdbef4c108c
Showing with 3 additions and 6 deletions.
  1. +3 −6 src/server.cpp
@@ -479,13 +479,10 @@ void Server::step(float dtime)
JMutexAutoLock lock(m_step_dtime_mutex);
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();
if(async_err != "") {
errorstream << "UNRECOVERABLE error occurred. Stopping server. "
<< "Please fix the following error:" << std::endl
<< async_err << std::endl;
assert(false);
if(async_err != ""){
throw ServerError(async_err);
}
}

1 comment on commit 699d42e

@nerzhul

This comment has been minimized.

Copy link
Member

@nerzhul nerzhul commented on 699d42e Mar 17, 2015

Okay for the client side problem. But you didn't fix the server side problem. The server crashes because we throw in the nether.

Please sign in to comment.