diff options
| author | callum <none@none> | 2012-01-23 17:06:15 -0800 |
|---|---|---|
| committer | callum <none@none> | 2012-01-23 17:06:15 -0800 |
| commit | 133b9a4036a9a0230ad5ed26862fdf28d5c523dc (patch) | |
| tree | 8e4c1197239ca8e5378d097760a77ff9c9b02ae1 /indra/newview/llfilepicker.cpp | |
| parent | 4140a688548a1139466740c87cdec883f267cfa7 (diff) | |
| parent | 3ebaa5b0a69f7ae63c74bc4a1a80a5ec5b988569 (diff) | |
merge with head
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(); |