Merge branch 'develop' into MAX-309

2014-10-16 12:51:52 +02:00
parent f2362c3359 0633dc568c
commit abfaedb1c7
1 changed files with 4 additions and 4 deletions
--- a/log_manager/log_manager.cc
+++ b/log_manager/log_manager.cc
@ -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
 			{