From a3ce02e073df7e3f8484bd51fc501ccb4bc1efab Mon Sep 17 00:00:00 2001
From: Tim Su <tim@todoroo.com>
Date: Sat, 10 Jul 2010 00:15:59 -0700
Subject: [PATCH] Fixed a NPE

---
 .../com/todoroo/astrid/activity/TaskEditActivity.java  | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java
index a0085e5c1..b09fbc689 100644
--- a/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java
@@ -306,13 +306,15 @@ public final class TaskEditActivity extends TabActivity {
         long idParam = intent.getLongExtra(ID_TOKEN, -1L);
 
         database.openForReading();
-        if(idParam == -1L) {
-            model = new Task();
-            taskService.save(model, false);
-        } else {
+        if(idParam > -1L) {
             model = taskService.fetchById(idParam, Task.PROPERTIES);
         }
 
+        // not found by id or was never passed an id
+        if(model == null) {
+            model = new Task();
+            taskService.save(model, false);
+        }
         if(model.getValue(Task.TITLE).length() == 0)
             FlurryAgent.onEvent("create-task");
         FlurryAgent.onEvent("edit-task");