-rw-r--r-- | korganizer/calendarview.cpp | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 76cce26..00ef145 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -818,2 +818,10 @@ int CalendarView::takeEvent( Incidence* local, Incidence* remote, int mode , b | |||
818 | 818 | ||
819 | |||
820 | // ************************************************ | ||
821 | // ************************************************ | ||
822 | // ************************************************ | ||
823 | // We may have that lastSync > remoteMod AND lastSync > localMod | ||
824 | // BUT remoteMod != localMod | ||
825 | |||
826 | |||
819 | if ( full && mode < SYNC_PREF_NEWEST ) | 827 | if ( full && mode < SYNC_PREF_NEWEST ) |
@@ -830,6 +838,6 @@ int CalendarView::takeEvent( Incidence* local, Incidence* remote, int mode , b | |||
830 | case SYNC_PREF_REMOTE: | 838 | case SYNC_PREF_REMOTE: |
831 | if ( lastSync > remoteMod ) | ||
832 | return 1; | ||
833 | if ( lastSync > localMod ) | 839 | if ( lastSync > localMod ) |
834 | return 2; | 840 | return 2; |
841 | if ( lastSync > remoteMod ) | ||
842 | return 1; | ||
835 | return 2; | 843 | return 2; |
@@ -837,3 +845,3 @@ int CalendarView::takeEvent( Incidence* local, Incidence* remote, int mode , b | |||
837 | case SYNC_PREF_NEWEST: | 845 | case SYNC_PREF_NEWEST: |
838 | if ( localMod > remoteMod ) | 846 | if ( localMod >= remoteMod ) |
839 | return 1; | 847 | return 1; |
@@ -844,2 +852,4 @@ int CalendarView::takeEvent( Incidence* local, Incidence* remote, int mode , b | |||
844 | //qDebug("lsy %s --- lo %s --- re %s ", lastSync.toString().latin1(), localMod.toString().latin1(), remoteMod.toString().latin1() ); | 852 | //qDebug("lsy %s --- lo %s --- re %s ", lastSync.toString().latin1(), localMod.toString().latin1(), remoteMod.toString().latin1() ); |
853 | if ( lastSync > remoteMod && lastSync > localMod) | ||
854 | return 0; | ||
845 | if ( lastSync > remoteMod ) | 855 | if ( lastSync > remoteMod ) |