Added check for METHOD before checking DTSTART.

diff --git a/source/objects/calendarevent/CalendarEvent.cpp b/source/objects/calendarevent/CalendarEvent.cpp
index 720c7bd..e061050 100644 (file)
--- a/source/objects/calendarevent/CalendarEvent.cpp
+++ b/source/objects/calendarevent/CalendarEvent.cpp
@@ -100,31 +100,37 @@ CalendarObjectValidResult CalendarEventObject::ValidObject(){
        
        SeekCount = 0;
        
-       // Look for DTSTART.
+       // Look for DTSTART if nothing is set for METHOD..
        
-       for (vector<string>::iterator iter = ObjectName.begin();
-               iter != ObjectName.end(); iter++){
+       if (MethodData.size() == 0){
+       
+               for (vector<string>::iterator iter = ObjectName.begin();
+                       iter != ObjectName.end(); iter++){
                        
-               try{
-                       PropertyName = ObjectName[SeekCount].substr(0,7);
-               }
+                       try{
+                               PropertyName = ObjectName[SeekCount].substr(0,7);
+                       }
                        
-               catch(const out_of_range& oor){
-                       continue;
-               }
+                       catch(const out_of_range& oor){
+                               continue;
+                       }
                
-               if (PropertyName == "DTSTART"){
+                       if (PropertyName == "DTSTART"){
                        
-                       if (ValidDateTimeStart == false){
-                               ValidDateTimeStart = true;
-                       } else {
-                               return CALENDAROBJECTVALID_INVALIDFORMAT;
-                       }
+                               if (ValidDateTimeStart == false){
+                                       ValidDateTimeStart = true;
+                               } else {
+                                       return CALENDAROBJECTVALID_INVALIDFORMAT;
+                               }
                                
-               }
+                       }
                        
-               SeekCount++;
+                       SeekCount++;
                        
+               }
+       
+       } else {
+               ValidDateTimeStart = true;
        }
        
        SeekCount = 0;