Run ProcessData after loading the data in LoadString.

[xestiacalendar/.git] / source / objects / calendarobject / CalendarObject.cpp

diff --git a/source/objects/calendarobject/CalendarObject.cpp b/source/objects/calendarobject/CalendarObject.cpp
index e63d9d8..01d939d 100644 (file)
--- a/source/objects/calendarobject/CalendarObject.cpp
+++ b/source/objects/calendarobject/CalendarObject.cpp
@@ -144,6 +144,19 @@ CalendarObjectLoadResult CalendarObject::LoadString(std::string *LoadStringData)
        CalendarObjectValidResult BaseDataResult = ValidBaseObject();
        CalendarObjectValidResult EventDataResult = ValidObject();
        
+       if (BaseDataResult != CALENDAROBJECTVALID_OK || 
+               EventDataResult != CALENDAROBJECTVALID_OK){
+                       
+               StringProcResult = CALENDAROBJECTLOAD_INVALIDFORMAT;
+                       
+       } else {
+               
+               StringProcResult = CALENDAROBJECTLOAD_OK;
+               
+       }
+       
+       ProcessData();
+       
        return StringProcResult;
        
 }
@@ -171,7 +184,15 @@ CalendarObjectValidResult CalendarObject::ValidBaseObject(){
                        }
                                
                }
-                       
+               
+               if (ObjectName[SeekCount] == "END" &&
+                       ObjectData[SeekCount] == "VCALENDAR" &&
+                       ValidBegin == false){
+               
+                       return CALENDAROBJECTVALID_INVALIDFORMAT;
+                               
+               }
+               
                SeekCount++;
                        
        }