1 files changed, 15 insertions, 2 deletions

diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp
index 98c9bd9..8d957eb 100644
--- a/korganizer/kotodoview.cpp
+++ b/korganizer/kotodoview.cpp
@@ -1175,25 +1175,38 @@ void KOTodoView::itemDoubleClicked(QListViewItem *item)
     pendingSubtodo = 0;
     //int row = mTodoListView->header()->sectionAt ( mTodoListView->header()->mapFromGlobal( QCursor::pos()).x() );
     int row = mTodoListView->header()->sectionAt ( mTodoListView->viewportToContents(mTodoListView->viewport()->mapFromGlobal( QCursor::pos())) .x() );
     //qDebug("ROW %d ", row);
     if (!item) {
         newTodo();
         return;
     } else {
-        if ( row == 2 || row == 1 ) {
+        if ( row == 1 ) {
             mActiveItem = (KOTodoViewItem *) item;
             newSubTodo();
             return;
         }
-        if ( row == 5 || row == 6 ) {
+        if ( row == 5 || row == 6 || row == 2) {
             mActiveItem = (KOTodoViewItem *) item;
+            Todo * t = mActiveItem->todo();
+            if ( t->isRunning() ) {
+                if (  t->runTime()  < 15) {
+                    t->stopRunning();
+                    mActiveItem->construct();
+                    return;
+                }
+                else
             toggleRunningItem();
             return;
+            } else {
+                t->setRunning( true );
+                mActiveItem->construct();
+                return;
+            }
         }
     }
     if ( KOPrefs::instance()->mEditOnDoubleClick )
         editItem( item );
     else
         showItem( item , QPoint(), 0 );
 }
 void KOTodoView::toggleRunningItem()