diff options
| author | andreykproductengine <andreykproductengine@lindenlab.com> | 2017-05-26 15:11:37 +0300 |
|---|---|---|
| committer | andreykproductengine <andreykproductengine@lindenlab.com> | 2017-05-26 15:11:37 +0300 |
| commit | fe49c1e8a5b3ebbb8fddeb23d32d4de68558fa37 (patch) | |
| tree | 1d92a017f9c4fd02aef6bb90f05a9af91ef11d2a /indra/newview | |
| parent | bb8609fa9408f206142b5c67983c7d0fd1876b19 (diff) | |
MAINT-1139 Catch Windows crash on Saving snapshot
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llfilepicker.cpp | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/indra/newview/llfilepicker.cpp b/indra/newview/llfilepicker.cpp index a7236d1778..7e92643b93 100644 --- a/indra/newview/llfilepicker.cpp +++ b/indra/newview/llfilepicker.cpp @@ -544,11 +544,18 @@ BOOL LLFilePicker::getSaveFile(ESaveFilter filter, const std::string& filename) send_agent_pause(); { // NOTA BENE: hitting the file dialog triggers a window focus event, destroying the selection manager!! - success = GetSaveFileName(&mOFN); - if (success) + try { - std::string filename = utf16str_to_utf8str(llutf16string(mFilesW)); - mFiles.push_back(filename); + success = GetSaveFileName(&mOFN); + if (success) + { + std::string filename = utf16str_to_utf8str(llutf16string(mFilesW)); + mFiles.push_back(filename); + } + } + catch (...) + { + LOG_UNHANDLED_EXCEPTION(""); } gKeyboard->resetKeys(); } |