X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;ds=sidebyside;f=source%2Fobjects%2Fcalendarobject%2FCalendarObject.cpp;h=01d939d2a883b14dea36d5bc9496311a837cab54;hb=ea3ccde57664c4d5d24ff71db8ce808dc6398a36;hp=1178ad064cc1dbe6ad01403472516b913bdd5a5c;hpb=165637cbdcf8c90dba03710b388d8fe1d196cbe4;p=xestiacalendar%2F.git

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