diff --git a/linphone-app/src/app/paths/Paths.cpp b/linphone-app/src/app/paths/Paths.cpp index 33052159b..2f8b382ba 100644 --- a/linphone-app/src/app/paths/Paths.cpp +++ b/linphone-app/src/app/paths/Paths.cpp @@ -244,7 +244,7 @@ string Paths::getFriendsListFilePath () { } string Paths::getDownloadDirPath () { - return getWritableDirPath(QStandardPaths::writableLocation(QStandardPaths::DownloadLocation)); + return getWritableDirPath(QStandardPaths::writableLocation(QStandardPaths::DownloadLocation) + QDir::separator()); } std::string Paths::getLimeDatabasePath (){ diff --git a/linphone-app/src/components/content/ContentProxyModel.cpp b/linphone-app/src/components/content/ContentProxyModel.cpp index 52381316e..1cdd3c099 100644 --- a/linphone-app/src/components/content/ContentProxyModel.cpp +++ b/linphone-app/src/components/content/ContentProxyModel.cpp @@ -57,17 +57,22 @@ bool ContentProxyModel::lessThan (const QModelIndex &left, const QModelIndex &ri const ContentModel *contentB = sourceModel()->data(right).value(); bool aIsForward = contentA->getChatMessageModel()->isForward(); bool aIsReply = contentA->getChatMessageModel()->isReply(); + bool aIsVoiceRecording = contentA->isVoiceRecording(); bool aIsFile = contentA->isFile() || contentA->isFileEncrypted() || contentA->isFileTransfer(); bool aIsText = contentA->isText() ; bool bIsForward = contentB->getChatMessageModel()->isForward(); bool bIsReply = contentB->getChatMessageModel()->isReply(); + bool bIsVoiceRecording = contentB->isVoiceRecording(); bool bIsFile = contentB->isFile() || contentB->isFileEncrypted() || contentB->isFileTransfer(); bool bIsText = contentB->isText() ; - return aIsForward && !bIsForward - || aIsReply && !bIsForward && !bIsReply - || aIsFile && !bIsForward && !bIsReply && !bIsFile - || aIsText && !bIsForward && !bIsReply && !bIsFile && !bIsText - - ; + return !bIsForward && (aIsForward + || !bIsReply && (aIsReply + || !bIsVoiceRecording && (aIsVoiceRecording + || !bIsFile && (aIsFile + || aIsText && !bIsText + ) + ) + ) + ); }