1 files changed, 12 insertions, 3 deletions

diff --git a/core/pim/todo/templatedialogimpl.cpp b/core/pim/todo/templatedialogimpl.cpp
index c2306ac..63d8107 100644
--- a/core/pim/todo/templatedialogimpl.cpp
+++ b/core/pim/todo/templatedialogimpl.cpp
@@ -79,3 +79,6 @@ void TemplateDialogImpl::slotAdd() {
 void TemplateDialogImpl::slotRemove() {
-    TemplateListItem* item = (TemplateListItem*) listView()->currentItem();
+    if (!listView()->currentItem() )
+        return;
+
+    TemplateListItem* item = static_cast<TemplateListItem*>(  listView()->currentItem() );
     listView()->takeItem( item );
@@ -87,3 +90,6 @@ void TemplateDialogImpl::slotRemove() {
 void TemplateDialogImpl::slotEdit() {
-    TemplateListItem* item = (TemplateListItem*)listView()->currentItem();
+    if ( !listView()->currentItem() )
+        return;
+
+    TemplateListItem* item = static_cast<TemplateListItem*>( listView()->currentItem() );
     OTodo ev = m_win->currentEditor()->edit( m_win, item->event() );
@@ -101,3 +107,6 @@ void TemplateDialogImpl::slotEdit() {
 void TemplateDialogImpl::slotReturn() {
-    TemplateListItem* tbl = (TemplateListItem*)listView()->currentItem();
+    if ( !listView()->currentItem() )
+        return;
+
+    TemplateListItem* tbl = static_cast<TemplateListItem*>( listView()->currentItem() );