Finish 1.4.111

# Conflicts:
#	limereport/lrreportrender.cpp
This commit is contained in:
Arin Alexander
2018-12-21 19:31:00 +03:00
4 changed files with 20 additions and 32 deletions

View File

@@ -381,7 +381,7 @@ int BandDesignIntf::maxChildIndex(BandDesignIntf::BandsType bandType) const{
int BandDesignIntf::maxChildIndex(QSet<BandDesignIntf::BandsType> ignoredBands) const{
int curIndex = bandIndex();
foreach(BandDesignIntf* childBand, childBands()){
if (!ignoredBands.contains(childBand->bandType()) && childBand->bandIndex()>bandIndex()){
if (!ignoredBands.contains(childBand->bandType())){
curIndex = std::max(curIndex,childBand->maxChildIndex(ignoredBands));
}
}