diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2017-08-28 14:03:26 +0100 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2017-08-28 14:03:26 +0100 |
| commit | a254ca8b442e0a17e7048b792fbba48c8db592ee (patch) | |
| tree | 44d591046709d7b8331ab3e8657019326b14cdfe /indra/newview/llfilepicker.cpp | |
| parent | e27efe894740c0c3c959115524ac49db9615262a (diff) | |
| parent | 08cbed55ef5689fcc5a02dfb3b9afde15487036e (diff) | |
merge
Diffstat (limited to 'indra/newview/llfilepicker.cpp')
| -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(); } |