Merge branch 'shm_log_fix' into develop

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

View File

@ -2218,8 +2218,8 @@ static bool logfile_init(
if (!writable || if (!writable ||
file_is_symlink(logfile->lf_full_file_name)) file_is_symlink(logfile->lf_full_file_name))
{ {
unlink(logfile->lf_full_file_name);
nameconflicts = true; nameconflicts = true;
goto file_create_fail;
} }
} }
else else