Changeset 1862

Timestamp:

09/10/2007 00:21:48 (15 months ago)

Author:

chris

Message:

Fix crash when notifyscript is called for BackupStart? or BackupFinish?.

Files:

• box/trunk/bin/bbackupd/BackupDaemon.cpp (modified) (1 diff)

box/trunk/bin/bbackupd/BackupDaemon.cpp

@@ -2279 +2279 @@
         }
 
-        // Is there a notifation script?
+        // Is there a notification script?
         const Configuration &conf(GetConfiguration());
-        if(!conf.KeyExists("NotifyScript") &&
-                Event != NotifyEvent_BackupStart &&
-                Event != NotifyEvent_BackupFinish)
+        if(!conf.KeyExists("NotifyScript"))
         {
                 // Log, and then return
-                BOX_ERROR("Not notifying administrator about event "
-                        << sEventNames[Event] << " -- set NotifyScript "
-                        "to do this in future");
+                if(Event != NotifyEvent_BackupStart &&
+                        Event != NotifyEvent_BackupFinish)
+                {
+                        BOX_ERROR("Not notifying administrator about event "
+                                << sEventNames[Event] << " -- set NotifyScript "
+                                "to do this in future");
+                }
                 return;
         }