Martchus
/
syncthingtray
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Avoid using deprecated `folderID`

This commit is contained in:
Martchus 2022-06-06 11:30:16 +02:00
parent 3945ac3471
commit 8052d04252
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
connector/syncthingconnection_requests.cpp
View File

@ -1535,9 +1535,10 @@ void SyncthingConnection::readDevRejected(DateTime eventTime, const QString &dev
*/
void SyncthingConnection::readChangeEvent(DateTime eventTime, const QString &eventType, const QJsonObject &eventData)
{
// read ID via "folder" with fallback to "folderID" (which is deprecated since version v1.1.2)
int index;
auto *const dirInfo(findDirInfo(QLatin1String("folderID"), eventData, &index));
if (!dirInfo) {
auto *dirInfo = findDirInfo(QLatin1String("folder"), eventData, &index);
if (!dirInfo && !(dirInfo = findDirInfo(QLatin1String("folderID"), eventData, &index))) {
return;
}