diff options
| author | Richard Linden <none@none> | 2012-01-23 17:50:15 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-01-23 17:50:15 -0800 |
| commit | ff5fe4ffc06fa9220043d82a2d7d7dbc0b7ffd77 (patch) | |
| tree | f6b31777ceb1a66c81aa7322687a9068fbd6a3b9 /indra/newview/llfilepicker.cpp | |
| parent | ea6cbc7b6b1de051a9bb1c311c4399a2b4d42cb3 (diff) | |
| parent | e09661f6ec467ea98715a2a04db40fc4e6b7ce02 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-merge
Diffstat (limited to 'indra/newview/llfilepicker.cpp')
| -rw-r--r-- | indra/newview/llfilepicker.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/llfilepicker.cpp b/indra/newview/llfilepicker.cpp index 8024755e86..360e35f6d3 100644 --- a/indra/newview/llfilepicker.cpp +++ b/indra/newview/llfilepicker.cpp @@ -1073,8 +1073,11 @@ void LLFilePicker::chooser_responder(GtkWidget *widget, gint response, gpointer } // set the default path for this usage context. - picker->mContextToPathMap[picker->mCurContextName] = - gtk_file_chooser_get_current_folder(GTK_FILE_CHOOSER(widget)); + const char* cur_folder = gtk_file_chooser_get_current_folder(GTK_FILE_CHOOSER(widget)); + if (cur_folder != NULL) + { + picker->mContextToPathMap[picker->mCurContextName] = cur_folder; + } gtk_widget_destroy(widget); gtk_main_quit(); |