mirror of
https://github.com/moparisthebest/minetest
synced 2024-11-17 23:05:07 -05:00
tuned error reporting a bit
This commit is contained in:
parent
179fc8597b
commit
ea69a49a7b
29
src/main.cpp
29
src/main.cpp
@ -1248,18 +1248,18 @@ int main(int argc, char *argv[])
|
|||||||
GUI stuff
|
GUI stuff
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
/*
|
||||||
|
If an error occurs, this is set to something and the
|
||||||
|
menu-game loop is restarted. It is then displayed before
|
||||||
|
the menu.
|
||||||
|
*/
|
||||||
|
std::wstring error_message = L"";
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Menu-game loop
|
Menu-game loop
|
||||||
*/
|
*/
|
||||||
while(device->run() && kill == false)
|
while(device->run() && kill == false)
|
||||||
{
|
{
|
||||||
/*
|
|
||||||
If an error occurs, this is set to something and the
|
|
||||||
menu-game loop is restarted. It is then displayed before
|
|
||||||
the menu.
|
|
||||||
*/
|
|
||||||
std::wstring error_message = L"";
|
|
||||||
|
|
||||||
// This is used for catching disconnects
|
// This is used for catching disconnects
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
@ -1404,6 +1404,21 @@ int main(int argc, char *argv[])
|
|||||||
dstream<<DTIME<<"Connection error (timed out?)"<<std::endl;
|
dstream<<DTIME<<"Connection error (timed out?)"<<std::endl;
|
||||||
error_message = L"Connection error (timed out?)";
|
error_message = L"Connection error (timed out?)";
|
||||||
}
|
}
|
||||||
|
catch(SocketException &e)
|
||||||
|
{
|
||||||
|
dstream<<DTIME<<"Socket error (port already in use?)"<<std::endl;
|
||||||
|
error_message = L"Socket error (port already in use?)";
|
||||||
|
}
|
||||||
|
#ifdef NDEBUG
|
||||||
|
catch(std::exception &e)
|
||||||
|
{
|
||||||
|
narrow_message = "Some exception, what()=\"";
|
||||||
|
narrow_message += e.what();
|
||||||
|
narrow_message += "\"";
|
||||||
|
dstream<<DTIME<<narrow_message<<std::endl;
|
||||||
|
error_message = narrow_to_wide(narrow_message);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
} // Menu-game loop
|
} // Menu-game loop
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user