chatterino2
Code Issues

switched order in loaded image selection

Browse Source
This commit is contained in:
fourtf
2019-08-21 02:21:12 +02:00
parent e140905faf
commit d709b98331
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/messages/ImageSet.cpp
+5 -5
View File
@@ -92,14 +92,14 @@ const ImagePtr &ImageSet::getImageOrLoaded(float scale) const
// prefer other image if selected image is not loaded yet // prefer other image if selected image is not loaded yet
if (result->loaded()) if (result->loaded())
return result; return result;
else if (this->imageX1_->loaded())
return this->imageX1_;
else if (this->imageX2_ && !this->imageX2_->isEmpty() &&
this->imageX2_->loaded())
return this->imageX2_;
else if (this->imageX3_ && !this->imageX3_->isEmpty() && else if (this->imageX3_ && !this->imageX3_->isEmpty() &&
this->imageX3_->loaded()) this->imageX3_->loaded())
return this->imageX3_; return this->imageX3_;
else if (this->imageX2_ && !this->imageX2_->isEmpty() &&
this->imageX2_->loaded())
return this->imageX2_;
else if (this->imageX1_->loaded())
return this->imageX1_;
else else
return result; return result;
} }