Merge branch 'shm_log_fix' into develop

This commit is contained in:
Markus Makela 2014-10-15 21:57:53 +03:00
commit 0633dc568c

View File

@ -2217,10 +2217,10 @@ static bool logfile_init(
/** Found similarly named file which isn't writable */
if (!writable ||
file_is_symlink(logfile->lf_full_file_name))
{
nameconflicts = true;
goto file_create_fail;
}
{
unlink(logfile->lf_full_file_name);
nameconflicts = true;
}
}
else
{