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

…stream + assert" This reverts commit 5f8e48c.
minetest · Mar 17, 2015 · 699d42e · 699d42e · nerzhul · Mar 17, 2015
1 parent ceac41e
commit 699d42e
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/src/server.cpp b/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);
 	}
 }