Merge branch 'master' into sdl2

This commit is contained in:
Tim Angus 2013-09-16 22:34:51 +01:00
commit 76e49b668e
31 changed files with 1353 additions and 568 deletions

View file

@ -513,6 +513,7 @@ void Sys_ErrorDialog( const char *error )
const char *homepath = Cvar_VariableString( "fs_homepath" );
const char *gamedir = Cvar_VariableString( "fs_game" );
const char *fileName = "crashlog.txt";
char *dirpath = FS_BuildOSPath( homepath, gamedir, "");
char *ospath = FS_BuildOSPath( homepath, gamedir, fileName );
Sys_Print( va( "%s\n", error ) );
@ -522,8 +523,16 @@ void Sys_ErrorDialog( const char *error )
#endif
// Make sure the write path for the crashlog exists...
if( FS_CreatePath( ospath ) ) {
Com_Printf( "ERROR: couldn't create path '%s' for crash log.\n", ospath );
if(!Sys_Mkdir(homepath))
{
Com_Printf("ERROR: couldn't create path '%s' for crash log.\n", homepath);
return;
}
if(!Sys_Mkdir(dirpath))
{
Com_Printf("ERROR: couldn't create path '%s' for crash log.\n", dirpath);
return;
}