Skip to content
Snippets Groups Projects
Commit 4e76ec36 authored by Mike Antipov's avatar Mike Antipov
Browse files

Fixed major bug EXT-6802 (Cancelling out of People Chooser while Searching Causes Crash)

* Added check of Avatar Picker floater (People Chooser) against NULL in search callback.

Reviewed by Vadim at https://codereview.productengine.com/secondlife/r/236/
(transplanted from 480f67e4eac0223626ce549a20760e81c4bce5b1)
parent 956041ff
No related branches found
No related tags found
No related merge requests found
...@@ -387,8 +387,8 @@ void LLFloaterAvatarPicker::processAvatarPickerReply(LLMessageSystem* msg, void* ...@@ -387,8 +387,8 @@ void LLFloaterAvatarPicker::processAvatarPickerReply(LLMessageSystem* msg, void*
LLFloaterAvatarPicker* floater = LLFloaterReg::findTypedInstance<LLFloaterAvatarPicker>("avatar_picker"); LLFloaterAvatarPicker* floater = LLFloaterReg::findTypedInstance<LLFloaterAvatarPicker>("avatar_picker");
// these are not results from our last request // floater is closed or these are not results from our last request
if (query_id != floater->mQueryID) if (NULL == floater || query_id != floater->mQueryID)
{ {
return; return;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment