Fixed DAE exporter timer expiry on texture saving

meow-7.2.2
Hecklezz 2026-01-11 23:47:11 +10:00
parent a9295b3dec
commit dc40cdcd4d
1 changed files with 4 additions and 1 deletions

View File

@ -338,8 +338,8 @@ void ColladaExportFloater::saveTextures()
mSaver.mImageFormat = DAEExportUtil::image_format_ext[gSavedSettings.getS32("DAEExportTexturesFormat")];
LL_DEBUGS("export") << "Starting to save textures" << LL_ENDL;
mTimer.setTimerExpirySec(TEXTURE_DOWNLOAD_TIMEOUT);
mTimer.start();
mTimer.setTimerExpirySec(TEXTURE_DOWNLOAD_TIMEOUT);
updateTitleProgress();
gIdleCallbacks.addFunction(CacheReadResponder::saveTexturesWorker, this);
}
@ -468,6 +468,7 @@ void ColladaExportFloater::CacheReadResponder::saveTexturesWorker(void* data)
me->mTexturesToSave.erase(id);
me->updateTitleProgress();
me->mTimer.reset();
me->mTimer.setTimerExpirySec(TEXTURE_DOWNLOAD_TIMEOUT);
}
else
{
@ -491,6 +492,7 @@ void ColladaExportFloater::CacheReadResponder::saveTexturesWorker(void* data)
me->mTexturesToSave.erase(id);
me->updateTitleProgress();
me->mTimer.reset();
me->mTimer.setTimerExpirySec(TEXTURE_DOWNLOAD_TIMEOUT);
}
else if (me->mTimer.hasExpired())
{
@ -498,6 +500,7 @@ void ColladaExportFloater::CacheReadResponder::saveTexturesWorker(void* data)
me->mTexturesToSave.erase(id);
me->updateTitleProgress();
me->mTimer.reset();
me->mTimer.setTimerExpirySec(TEXTURE_DOWNLOAD_TIMEOUT);
}
}
}