[hamster-applet/gnome-2-32] properly avoid elimination - was screwing up the data before

[Toms Baugis <tbaugis src gnome org>]

commit 1aea69c70de9dd82058956b200ce8024bf037d00
Author: Toms Bauģis <toms baugis gmail com>
Date:   Sun Aug 22 11:28:49 2010 +0100

    properly avoid elimination - was screwing up the data before

 src/hamster/db.py |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
---
diff --git a/src/hamster/db.py b/src/hamster/db.py
index b2668c0..08f1a22 100644
--- a/src/hamster/db.py
+++ b/src/hamster/db.py
@@ -452,6 +452,8 @@ class Storage(storage.Storage):
 
         for fact in conflicts:
             # won't eliminate as it is better to have overlapping entries than loosing data
+            if start_time < fact["start_time"] and end_time > fact["end_time"]:
+                continue
 
             # split - truncate until beginning of new entry and create new activity for end
             if fact["start_time"] < start_time < fact["end_time"] and \