Fixed a null pointer crash

13 years ago · 618a2cd347
parent 6f8bb86357
commit 618a2cd347
1 changed files with 1 additions and 1 deletions
--- a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
@ -749,7 +749,7 @@ public class TaskListActivity extends ListActivity implements OnScrollListener,
        }

        if(resultCode != RESULT_CANCELED) {
-            if (data.hasExtra(TaskEditActivity.TOKEN_TASK_WAS_ASSIGNED) && data.getBooleanExtra(TaskEditActivity.TOKEN_TASK_WAS_ASSIGNED, false) && !isFilter) {
+            if (data != null && data.hasExtra(TaskEditActivity.TOKEN_TASK_WAS_ASSIGNED) && data.getBooleanExtra(TaskEditActivity.TOKEN_TASK_WAS_ASSIGNED, false) && !isFilter) {
                String assignedTo = data.getStringExtra(TaskEditActivity.TOKEN_ASSIGNED_TO);
                switchToAssignedFilter(assignedTo);
            } else {