1 files changed, 6 insertions, 9 deletions

diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index e85abb1..dd97cbf 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -2694,35 +2694,32 @@ void LLAppViewer::initMarkerFile()
         std::string llerror_marker_file = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, LLERROR_MARKER_FILE_NAME);
         std::string error_marker_file = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, ERROR_MARKER_FILE_NAME);
 
-        
         if (LLAPRFile::isExist(mMarkerFileName, LL_APR_RB) && !anotherInstanceRunning())
         {
                 gLastExecEvent = LAST_EXEC_FROZE;
                 LL_INFOS("MarkerFile") << "Exec marker found: program froze on previous execution" << LL_ENDL;
         }    
-    
         if(LLAPRFile::isExist(logout_marker_file, LL_APR_RB))
         {
-                LL_INFOS("MarkerFile") << "Last exec LLError crashed, setting LastExecEvent to " << LAST_EXEC_LLERROR_CRASH << LL_ENDL;
                 gLastExecEvent = LAST_EXEC_LOGOUT_FROZE;
+                LL_INFOS("MarkerFile") << "Last exec LLError crashed, setting LastExecEvent to " << gLastExecEvent << LL_ENDL;
+                LLAPRFile::remove(logout_marker_file);
         }
         if(LLAPRFile::isExist(llerror_marker_file, LL_APR_RB))
         {
-                llinfos << "Last exec LLError crashed, setting LastExecEvent to " << LAST_EXEC_LLERROR_CRASH << llendl;
                 if(gLastExecEvent == LAST_EXEC_LOGOUT_FROZE) gLastExecEvent = LAST_EXEC_LOGOUT_CRASH;
                 else gLastExecEvent = LAST_EXEC_LLERROR_CRASH;
+                LL_INFOS("MarkerFile") << "Last exec LLError crashed, setting LastExecEvent to " << gLastExecEvent << LL_ENDL;
+                LLAPRFile::remove(llerror_marker_file);
         }
         if(LLAPRFile::isExist(error_marker_file, LL_APR_RB))
         {
-                LL_INFOS("MarkerFile") << "Last exec crashed, setting LastExecEvent to " << LAST_EXEC_OTHER_CRASH << LL_ENDL;
                 if(gLastExecEvent == LAST_EXEC_LOGOUT_FROZE) gLastExecEvent = LAST_EXEC_LOGOUT_CRASH;
                 else gLastExecEvent = LAST_EXEC_OTHER_CRASH;
+                LL_INFOS("MarkerFile") << "Last exec crashed, setting LastExecEvent to " << gLastExecEvent << LL_ENDL;
+                LLAPRFile::remove(error_marker_file);
         }
         
-        LLAPRFile::remove(logout_marker_file);
-        LLAPRFile::remove(llerror_marker_file);
-        LLAPRFile::remove(error_marker_file);
-        
         // No new markers if another instance is running.
         if(anotherInstanceRunning()) 
         {