X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fobjects%2Fcalendarobject%2FCalendarObject.cpp;h=6ed8acdd1183af10099efdcfcdbb3d5268833c59;hb=982b9393ccd85901f5edbb406526360962ac63d5;hp=1178ad064cc1dbe6ad01403472516b913bdd5a5c;hpb=165637cbdcf8c90dba03710b388d8fe1d196cbe4;p=xestiacalendar%2F.git diff --git a/source/objects/calendarobject/CalendarObject.cpp b/source/objects/calendarobject/CalendarObject.cpp index 1178ad0..6ed8acd 100644 --- 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