From 3e3e934fd5d7fe615d5aca5cdb781cb0c9a54ea0 Mon Sep 17 00:00:00 2001 From: varjolintu Date: Thu, 24 May 2018 17:49:54 +0300 Subject: [PATCH] Fix entry sorting by title --- src/browser/BrowserService.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/browser/BrowserService.cpp b/src/browser/BrowserService.cpp index af35315a0f..7d3293bd95 100644 --- a/src/browser/BrowserService.cpp +++ b/src/browser/BrowserService.cpp @@ -543,7 +543,9 @@ QList BrowserService::sortEntries(QList& pwEntries, const QStrin // Sort same priority entries by Title or UserName auto entries = priorities.values(i); std::sort(entries.begin(), entries.end(), [&priorities, &field](Entry* left, Entry* right) { - return QString::localeAwareCompare(left->attributes()->value(field), right->attributes()->value(field)) < 0; + return (QString::localeAwareCompare(left->attributes()->value(field), right->attributes()->value(field)) < 0) || + ((QString::localeAwareCompare(left->attributes()->value(field), right->attributes()->value(field)) == 0) && + (QString::localeAwareCompare(left->attributes()->value("UserName"), right->attributes()->value("UserName")) < 0)); }); results << entries; if (BrowserSettings::bestMatchOnly() && !pwEntries.isEmpty()) {