summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorandreykproductengine <andreykproductengine@lindenlab.com>2017-12-01 18:50:39 +0200
committerandreykproductengine <andreykproductengine@lindenlab.com>2017-12-01 18:50:39 +0200
commitf32f0aff4b19461677cedfcab7bd3f66689cfe03 (patch)
treefeb12e24cfc235a7d0e24b52956aa1f93558ad5a /indra
parent62390a7e0a33f744de059fa51bc96643d707c2ec (diff)
MAINT-8036 Fixed Viewer freezing when overwriting existing snpshot with new one.
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llviewerwindow.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index 364de1d810..28f6837679 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -4442,7 +4442,8 @@ BOOL LLViewerWindow::saveImageNumbered(LLImageFormatted *image, BOOL force_picke
err = LLFile::stat( filepath, &stat_info );
i++;
}
- while( -1 != err ); // search until the file is not found (i.e., stat() gives an error).
+ while( -1 != err // Search until the file is not found (i.e., stat() gives an error).
+ && is_snapshot_name_loc_set); // Or stop if we are rewriting.
LL_INFOS() << "Saving snapshot to " << filepath << LL_ENDL;
return image->save(filepath);