diff options
| author | Andrew A. de Laix <alain@lindenlab.com> | 2011-03-28 14:00:35 -0700 |
|---|---|---|
| committer | Andrew A. de Laix <alain@lindenlab.com> | 2011-03-28 14:00:35 -0700 |
| commit | d20f8a07cce466dcdddd9c113c32f53faa4ab0fd (patch) | |
| tree | 127cd39082606737b8c463835edc5e51ca77b542 | |
| parent | 5b316df2249fc62c1e6a4f089b9726c4e62f23e0 (diff) | |
fix CHOP-402: use newer api call for move to trash that will rename if needed.
| -rw-r--r-- | indra/mac_updater/mac_updater.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/indra/mac_updater/mac_updater.cpp b/indra/mac_updater/mac_updater.cpp index 5d19e8a889..809f66cb1d 100644 --- a/indra/mac_updater/mac_updater.cpp +++ b/indra/mac_updater/mac_updater.cpp @@ -1230,20 +1230,14 @@ void *updatethreadproc(void*) // Move work directory to the trash if(tempDir[0] != 0) { -// chdir("/"); -// FSDeleteObjects(tempDirRef); - llinfos << "Moving work directory to the trash." << llendl; - err = FSMoveObject(&tempDirRef, &trashFolderRef, NULL); + FSRef trashRef; + OSStatus err = FSMoveObjectToTrashSync(&tempDirRef, &trashRef, 0); if(err != noErr) { llwarns << "failed to move files to trash, (error code " << err << ")" << llendl; } - -// snprintf(temp, sizeof(temp), "rm -rf '%s'", tempDir); -// printf("%s\n", temp); -// system(temp); } if(!gCancelled && !gFailure && (target[0] != 0)) |