X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fmisc.c;h=c196fe81d67703ca76620463d06a9ead7eff20df;hb=07e47c9cc4c619ab000b1dd8d8b318eaf5bae3b3;hp=7e273adadc5269a8ef394975dc5bafb39d4e375a;hpb=3c53030b9e20c59004046274e94eff2ee90d0ab5;p=rocksndiamonds.git diff --git a/src/libgame/misc.c b/src/libgame/misc.c index 7e273ada..c196fe81 100644 --- a/src/libgame/misc.c +++ b/src/libgame/misc.c @@ -754,7 +754,7 @@ void GetOptions(char *argv[], void (*print_usage_function)(void)) #if 1 /* if the program is configured to start from current directory (default), determine program package directory from program binary (some versions - of KDE/Konqueror and Mac OS X (especially "Maverick") apparently do not + of KDE/Konqueror and Mac OS X (especially "Mavericks") apparently do not set the current working directory to the program package directory) */ if (strEqual(ro_base_path, ".")) @@ -1045,6 +1045,13 @@ void Error(int mode, char *format, ...) va_start(ap, format); vfprintf_newline(program.error_file, format, ap); va_end(ap); + + if ((mode & ERR_EXIT) && !(mode & ERR_FROM_SERVER)) + { + va_start(ap, format); + program.exit_message_function(format, ap); + va_end(ap); + } } if (mode & ERR_HELP)