Browse Source

prevent duplicating emoticons on the list

pull/574/head
agilob 11 years ago
parent
commit
c079641fc1
No known key found for this signature in database
GPG Key ID: 2CACF3EEF598C663
  1. 10
      src/misc/smileypack.cpp

10
src/misc/smileypack.cpp

@ -68,11 +68,13 @@ QList<QPair<QString, QString> > SmileyPack::listSmileyPacks(const QStringList &p @@ -68,11 +68,13 @@ QList<QPair<QString, QString> > SmileyPack::listSmileyPacks(const QStringList &p
QString relPath = QDir(QCoreApplication::applicationDirPath()).relativeFilePath(absPath);
if (relPath.leftRef(2) == "..")
smileyPacks << QPair<QString, QString>(packageName, absPath);
else
smileyPacks << QPair<QString, QString>(packageName, relPath); // use relative path for subdirectories
{
if(!smileyPacks.contains(QPair<QString, QString>(packageName, absPath)))
smileyPacks << QPair<QString, QString>(packageName, absPath);
else if(!smileyPacks.contains(QPair<QString, QString>(packageName, relPath)))
smileyPacks << QPair<QString, QString>(packageName, relPath); // use relative path for subdirectories
}
}
dir.cdUp();
}
}

Loading…
Cancel
Save