1 files changed, 9 insertions, 9 deletions

diff --git a/core/pim/todo/taskeditorstatus.cpp b/core/pim/todo/taskeditorstatus.cpp
index b11fdab..4331877 100644
--- a/core/pim/todo/taskeditorstatus.cpp
+++ b/core/pim/todo/taskeditorstatus.cpp
@@ -66,3 +66,3 @@ TaskEditorStatus::TaskEditorStatus( QWidget* parent,  const char* name, WFlags f
 
-    QGridLayout *layout = new QGridLayout( container, 7, 3, 4, 4 ); 
+    QGridLayout *layout = new QGridLayout( container, 7, 3, 4, 4 );
 
@@ -93,3 +93,3 @@ TaskEditorStatus::TaskEditorStatus( QWidget* parent,  const char* name, WFlags f
     QWhatsThis::add( cmbProgress, tr( "Select progress made on this task here." ) );
-    
+
     // Start date
@@ -109,3 +109,3 @@ TaskEditorStatus::TaskEditorStatus( QWidget* parent,  const char* name, WFlags f
              this, SLOT( slotStartChanged( int, int, int ) ) );
-        
+
     // Due date
@@ -125,3 +125,3 @@ TaskEditorStatus::TaskEditorStatus( QWidget* parent,  const char* name, WFlags f
              this, SLOT( slotDueChanged( int, int, int ) ) );
-    
+
     // Completed
@@ -181,3 +181,3 @@ void TaskEditorStatus::load( const OTodo &todo )
     // Status
-    int state = todo.state().state();
+    int state = todo.hasState()? todo.state().state() : OPimState::NotStarted;
     if ( state == OPimState::Undefined )
@@ -188,3 +188,3 @@ void TaskEditorStatus::load( const OTodo &todo )
     cmbProgress->setCurrentItem( todo.progress() / 20 );
-    
+
     // Start date
@@ -218,3 +218,3 @@ void TaskEditorStatus::load( const OTodo &todo )
     // Maintainer Mode
-    state = todo.maintainer().mode();
+    state = todo.hasMaintainer() ? todo.maintainer().mode() : OPimMaintainer::Nothing;
     if ( state == OPimMaintainer::Undefined )
@@ -232,3 +232,3 @@ void TaskEditorStatus::save( OTodo &todo )
     todo.setState( OPimState( cmbStatus->currentItem() ) );
-    
+
     // Progress
@@ -261,3 +261,3 @@ void TaskEditorStatus::save( OTodo &todo )
         todo.setCompletedDate( inval );
-    
+
     // Maintainer mode - not implemented yet