diff options
| author | Vadim ProductEngine <vsavchuk@productengine.com> | 2012-01-23 17:50:04 +0200 |
|---|---|---|
| committer | Vadim ProductEngine <vsavchuk@productengine.com> | 2012-01-23 17:50:04 +0200 |
| commit | 8f60dc01366732713be8290a84bc50ba10059e73 (patch) | |
| tree | 34cf85c98e0f16049cea6cd2a7c0cf075de5232e | |
| parent | f324e67780cb002149b11d0fbf49f5d1794b7299 (diff) | |
EXT-1836 FIXED Avoid assigning NULL to an std::string.
| -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(); |