diff --git a/ChangeLog b/ChangeLog index e0a7e165..29b185a0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -22026,3 +22026,7 @@ 2021-07-08 Fred Gleason * Modified rdservice(8) to log the startup command-line for all dropboxes at DEBUG priority. +2021-07-08 Fred Gleason + * Fixed a regression in rdimport(1) that caused it to repeatedly + re-import files in dropbox mode when the '--delete-source' switch + was set. diff --git a/utils/rdimport/rdimport.cpp b/utils/rdimport/rdimport.cpp index e04431fb..a260faaf 100644 --- a/utils/rdimport/rdimport.cpp +++ b/utils/rdimport/rdimport.cpp @@ -1520,7 +1520,8 @@ void MainObject::VerifyFile(const QString &filename,unsigned *cartnum) found=true; QFileInfo *file=new QFileInfo(filename); dt=GetCachedTimestamp(filename); - if(dt.isNull()||(file->lastModified()>dt)) { + if(dt.isNull()|| + (file->lastModified().toSecsSinceEpoch()>dt.toSecsSinceEpoch())) { if((file->size()==(*ci)->size)&&(!(*ci)->failed)) { (*ci)->pass++; }