gergely/taskwarrior-2.x
1
0
Fork 0
Code Issues Actions Packages Projects Releases 1 Wiki Activity

Merge

Browse Source 
- Fixed segmentation fault if undo.data is empty
This commit is contained in:
Johannes Schlatow
2010-09-02 01:24:58 +02:00
parent 87ce13c8e0
commit d362088305
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/TDB.cpp
View File

@@ -1111,8 +1111,10 @@ void TDB::merge (const std::string& mergeFile)
rit = r.begin (); rit = r.begin ();
lit = l.begin (); lit = l.begin ();
rline = *rit; if (rit != r.end())
lline = *lit; rline = *rit;
if (lit != l.end())
lline = *lit;
/////////////////////////////////////// ///////////////////////////////////////
// find the branch-off point: // find the branch-off point: