Not Logged In
|
Login
|
Register
Home
|
News
|
Projects
|
Releases
Bugs
|
RFE
|
Repositories
|
Help
projects
/
xestiacalendar
/
.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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();
CalendarObjectValidResult BaseDataResult = ValidBaseObject();
CalendarObjectValidResult EventDataResult = ValidObject();
+ if (BaseDataResult != CALENDAROBJECTVALID_OK ||
+ EventDataResult != CALENDAROBJECTVALID_OK){
+
+ StringProcResult = CALENDAROBJECTLOAD_INVALIDFORMAT;
+
+ } else {
+
+ StringProcResult = CALENDAROBJECTLOAD_OK;
+
+ }
+
return StringProcResult;
}
return StringProcResult;
}
@@
-234,6
+245,4
@@
CalendarObjectValidResult CalendarObject::ValidBaseObject(){
}
}
-
-
}
\ No newline at end of file
}
\ No newline at end of file
Yn Maystri
© 2006 - 2019 Xestia Software Development
Software
Xestia Address Book
Xestia Calendar
Development
Xestia Gelforn
Everything else
About
News
Privacy Policy