SL-19097 Crash when selecting a model for upload and waiting too long

Should be fixed by SL-18996, but just in case user decides to select a model while viewer closes
meow-7.2.2
Andrey Kleshchev 2023-01-28 02:01:49 +02:00
parent 27080dc7f7
commit 21b5928652
1 changed files with 6 additions and 1 deletions

View File

@ -25,6 +25,8 @@
*/
#include "llmodelloader.h"
#include "llapp.h"
#include "llsdserialize.h"
#include "lljoint.h"
#include "llcallbacklist.h"
@ -363,7 +365,10 @@ bool LLModelLoader::isAlive(LLModelLoader* loader)
void LLModelLoader::loadModelCallback()
{
mLoadCallback(mScene,mModelList,mLod, mOpaqueData);
if (!LLApp::isExiting())
{
mLoadCallback(mScene, mModelList, mLod, mOpaqueData);
}
while (!isStopped())
{ //wait until this thread is stopped before deleting self