From 12d2bf47865559a8da087f6e3bbb4b65d421169c Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
Date: Wed, 18 Nov 2020 21:09:57 +0200
Subject: SL-14286 fixed crash when closing viewer while file picker is open

---
 indra/newview/llfloatermodelpreview.cpp | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'indra/newview/llfloatermodelpreview.cpp')

diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp
index b9c03f66a3..999e4a9582 100644
--- a/indra/newview/llfloatermodelpreview.cpp
+++ b/indra/newview/llfloatermodelpreview.cpp
@@ -103,6 +103,11 @@ LLMeshFilePicker::LLMeshFilePicker(LLModelPreview* mp, S32 lod)
 
 void LLMeshFilePicker::notify(const std::vector<std::string>& filenames)
 {
+	if(LLAppViewer::instance()->quitRequested())
+	{
+		return;
+	}
+	
 	if (filenames.size() > 0)
 	{
 		mMP->loadModel(filenames[0], mLOD);
-- 
cgit v1.2.3