1 files changed, 10 insertions, 6 deletions

diff --git a/libkcal/vcalformat.cpp b/libkcal/vcalformat.cpp
index 62a31ae..8efc1ea 100644
--- a/libkcal/vcalformat.cpp
+++ b/libkcal/vcalformat.cpp
@@ -327,7 +327,7 @@ VObject *VCalFormat::eventToVTodo(const Todo *anEvent)
 
   // related event
-  if (anEvent->relatedTo()) {
+  if (anEvent->relatedToUid()) {
     addPropValue(vtodo, VCRelatedToProp,
-                 anEvent->relatedTo()->uid().local8Bit());
+                 anEvent->relatedToUid().local8Bit());
   }
 
@@ -673,7 +673,7 @@ VObject* VCalFormat::eventToVEvent(const Event *anEvent)
 
   // related event
-  if (anEvent->relatedTo()) {
+  if (anEvent->relatedToUid()) {
     addPropValue(vevent, VCRelatedToProp,
-                 anEvent->relatedTo()->uid().local8Bit());
+                 anEvent->relatedToUid().local8Bit());
   }
 
@@ -1605,9 +1605,13 @@ void VCalFormat::populate(VObject *vcal)
   Event *ev;
   for ( ev=mEventsRelate.first(); ev != 0; ev=mEventsRelate.next() ) {
-    ev->setRelatedTo(mCalendar->event(ev->relatedToUid()));
+      Incidence * inc = mCalendar->event(ev->relatedToUid());
+      if ( inc )
+          ev->setRelatedTo( inc );
   }
   Todo *todo;
   for ( todo=mTodosRelate.first(); todo != 0; todo=mTodosRelate.next() ) {
-    todo->setRelatedTo(mCalendar->todo(todo->relatedToUid()));
+      Incidence * inc = mCalendar->todo(todo->relatedToUid());
+      if ( inc )
+          todo->setRelatedTo( inc );
   }
 }