Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Merge with develop

Browse source 
--HG--
branch : compatibility-develop
This commit is contained in:
Nimetu 2016-02-14 01:24:10 +02:00
commit b7f809c6a7
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
code/nel/src/gui/group_html.cpp
View file

@ -579,9 +579,11 @@ namespace NLGUI
string finalUrl; string finalUrl;
if (it->type == ImgType) if (it->type == ImgType)
{ {
CFile::moveFile(it->dest, tmpfile); // there is race condition if two browser instances are downloading same file
//if (lookupLocalFile (finalUrl, file.c_str(), false)) // second instance deletes first tmpfile and creates new file for itself.
if (CFile::getFileSize(tmpfile) > 0)
{ {
CFile::moveFile(it->dest, tmpfile);
for(uint i = 0; i < it->imgs.size(); i++) for(uint i = 0; i < it->imgs.size(); i++)
{ {
setImage(it->imgs[i].Image, it->dest); setImage(it->imgs[i].Image, it->dest);
@ -3876,6 +3878,9 @@ namespace NLGUI
// //
// 3/ if it doesn't work, display a placeholder and ask to dl the image into the cache // 3/ if it doesn't work, display a placeholder and ask to dl the image into the cache
// //
if (reloadImg && CFile::fileExists(image))
CFile::deleteFile(image);
image = "web_del.tga"; image = "web_del.tga";
addImageDownload(img, newImage, style); addImageDownload(img, newImage, style);
} }