Added check on the results of both ValidBaseObject and ValidObject

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

diff --git a/source/objects/calendarobject/CalendarObject.cpp b/source/objects/calendarobject/CalendarObject.cpp
index 1178ad0..6ed8acd 100644 (file)
--- a/source/objects/calendarobject/CalendarObject.cpp
+++ b/source/objects/calendarobject/CalendarObject.cpp
@@ -144,6 +144,17 @@ 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;
+               
+       }
+       
        return StringProcResult;
        
 }
@@ -234,6 +245,4 @@ CalendarObjectValidResult CalendarObject::ValidBaseObject(){
                
        }
        
-
-       
 }
\ No newline at end of file