Index: denali.pro.user =================================================================== diff -u -r2d0bacfbe1b70055247eb40743405a5f9acb15e3 -r04c386c7752b972928ecbf34b3e6e7f135c8a343 --- denali.pro.user (.../denali.pro.user) (revision 2d0bacfbe1b70055247eb40743405a5f9acb15e3) +++ denali.pro.user (.../denali.pro.user) (revision 04c386c7752b972928ecbf34b3e6e7f135c8a343) @@ -1,6 +1,6 @@ - + EnvironmentId @@ -1544,7 +1544,7 @@ 1 false - --disable-alarm-no-minimize --disable-timeout -disable-alarm-no-minimize --disable-unhandled-report + --disable-alarm-no-minimize --disable-timeout --disable-unhandled-report 3768 false true Index: sources/cloudsync/CloudSyncController.cpp =================================================================== diff -u -rcd7956150072dcb5264c891ee363074623052ead -r04c386c7752b972928ecbf34b3e6e7f135c8a343 --- sources/cloudsync/CloudSyncController.cpp (.../CloudSyncController.cpp) (revision cd7956150072dcb5264c891ee363074623052ead) +++ sources/cloudsync/CloudSyncController.cpp (.../CloudSyncController.cpp) (revision 04c386c7752b972928ecbf34b3e6e7f135c8a343) @@ -724,12 +724,6 @@ // NOTE: If a file with the name newName already exists, copy() returns false (i.e., QFile will not overwrite it). // For the current scenario it is ideal, since that folder will turn RO after the successful registration and copying the files and reboot. if ( ! QFile::copy (sourceFile, destination + fileName) ) { toLog(eError_CredentialCopy , {fileName }); ok = false; goto lOut; } - else { - // TODO: Registration should be atomic so it is all or nothing. - // remove all the copied files. - // it should be all or nothing - ok = false; goto lOut; - } } // if all the copies are successful then remove them. for ( auto sourceFile : vMessage.params ) {