U1DB

Merge lp:~thisfred/u1db/fix-broken-cosas into lp:u1db

  1. fix-broken-cosas
  2. Merge into trunk
Proposed by Eric Casteleijn
Status: Merged
Approved by: Eric Casteleijn
Approved revision: 374
Merged at revision: 375
Proposed branch: lp:~thisfred/u1db/fix-broken-cosas
Merge into: lp:u1db
Diff against target: 12 lines (+1/-1)
1 file modified
cosas/ui.py (+1/-1)
To merge this branch: bzr merge lp:~thisfred/u1db/fix-broken-cosas
Reviewer Review Type Date Requested Status
Stuart Langridge (community) Approve
Review via email: mp+119360@code.launchpad.net

Commit message

Fixed error when adding new tasks

Description of the change

Fixed error when adding new tasks

To post a comment you must log in.
Revision history for this message
Stuart Langridge (sil) wrote :

Fixed issue.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'cosas/ui.py'
2--- cosas/ui.py 2012-08-13 12:51:49 +0000
3+++ cosas/ui.py 2012-08-13 14:31:25 +0000
4@@ -278,7 +278,7 @@
5 return
6 if event.key() == QtCore.Qt.Key_Return:
7 current = self.todo_list.currentItem()
8- if current.task.has_conflicts:
9+ if current and current.task and current.task.has_conflicts:
10 self.open_conflicts_window(current.task.doc_id)
11 return
12 if not self.editing:

Subscribers

People subscribed via source and target branches