Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fatal paranoia cure

Browse Source
This commit is contained in:
Siana Gearz
2013-12-09 03:39:47 +01:00
parent 340286f918
commit e182173ee2
3 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
indra/newview/llappviewer.cpp
View File

@@ -2972,14 +2972,17 @@ void LLAppViewer::removeMarkerFile(bool leave_logout_marker)
mMarkerFile.close() ;
LLAPRFile::remove( mMarkerFileName );
}
if (mLogoutMarkerFile != NULL && !leave_logout_marker)
if (mLogoutMarkerFile != NULL)
{
LLAPRFile::remove( mLogoutMarkerFileName );
mLogoutMarkerFile = NULL;
}
else
{
LL_WARNS("MarkerFile") << "leaving markers because this is a second instance" << LL_ENDL;
if(!leave_logout_marker)
{
LLAPRFile::remove( mLogoutMarkerFileName );
mLogoutMarkerFile = NULL;
}
else
{
LL_WARNS("MarkerFile") << "leaving markers because this is a second instance" << LL_ENDL;
}
}
}