[Box Backup-commit] COMMIT r2197 - box/trunk/bin/bbackupd

boxbackup-dev@fluffy.co.uk boxbackup-dev@fluffy.co.uk
Wed, 2 Jul 2008 18:50:48 +0100 (BST)


Author: chris
Date: 2008-07-02 18:50:46 +0100 (Wed, 02 Jul 2008)
New Revision: 2197

Modified:
   box/trunk/bin/bbackupd/BackupDaemon.cpp
Log:
Add missing #include, thanks to Alex Howansky.

Reset notification state for backup-error after a successful backup,
thanks to Wolfgang Trexler.


Modified: box/trunk/bin/bbackupd/BackupDaemon.cpp
===================================================================
--- box/trunk/bin/bbackupd/BackupDaemon.cpp	2008-06-30 23:04:14 UTC (rev 2196)
+++ box/trunk/bin/bbackupd/BackupDaemon.cpp	2008-07-02 17:50:46 UTC (rev 2197)
@@ -10,6 +10,7 @@
 #include "Box.h"
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 
 #ifdef HAVE_UNISTD_H
@@ -888,7 +889,8 @@
 				}
 				else
 				{
-					// Unset the read error flag, so the						// error is reported again if it
+					// Unset the read error flag, so the
+					// error is reported again if it
 					// happens again
 					mNotificationsSent[NotifyEvent_ReadError] = false;
 				}
@@ -1014,6 +1016,13 @@
 					doSyncForcedByPreviousSyncError = true;
 				}
 			}
+			else
+			{
+				// Unset the read error flag, so the
+				// error is reported again if it
+				// happens again
+				mNotificationsSent[NotifyEvent_BackupError] = false;
+			}
 
 			// Log the stats
 			BOX_NOTICE("File statistics: total file size uploaded "