[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/work/kdab-post-4.0/kdepim
From:       Volker Krause <vkrause () kde ! org>
Date:       2007-12-18 16:54:10
Message-ID: 1197996850.659952.3302.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 750082 by vkrause:

Merged revisions 750031 via svnmerge from 
https://vkrause@svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim

........
  r750031 | vkrause | 2007-12-18 15:53:29 +0100 (Tue, 18 Dec 2007) | 4 lines
  
  Fix crash.
  
  Kolab issue 2348
........


 _M            . (directory)  
 M  +3 -1      korganizer/kotimelineview.cpp  


** branches/work/kdab-post-4.0/kdepim #property svnmerge-integrated
   - /branches/kdepim/enterprise/kdepim:1-708704,708706,708741,708749,709066,711604,71 \
1623,712056,714358,715112,717162,717727,723348-723367,723653,724153,724155,724546,7293 \
06,729611,731653,733159,733883,734242,734247,734273,735684,738629,739069,739670,743884,744689,747182,747318,747971,748016,748069,748416 \
/trunk/KDE/kdepim:1-738080  + \
/branches/kdepim/enterprise/kdepim:1-708704,708706,708741,708749,709066,711604,711623, \
712056,714358,715112,717162,717727,723348-723367,723653,724153,724155,724546,729306,72 \
9611,731653,733159,733883,734242,734247,734273,735684,738629,739069,739670,743884,744689,747182,747318,747971,748016,748069,748416,750031 \
                /trunk/KDE/kdepim:1-738080
--- branches/work/kdab-post-4.0/kdepim/korganizer/kotimelineview.cpp #750081:750082
@@ -308,7 +308,9 @@
     typedef QMap<KCal::ResourceCalendar*, M2_t> M1_t;
     for ( M1_t::ConstIterator it1 = mCalendarItemMap.constBegin(); it1 != \
                mCalendarItemMap.constEnd(); ++it1 ) {
       for ( M2_t::ConstIterator it2 = it1.data().constBegin(); it2 != \
                it1.data().constEnd(); ++it2 ) {
-        it2.data()->removeIncidence( incidence );
+        if ( it2.data() ) {
+          it2.data()->removeIncidence( incidence );
+        }
       }
     }
   }


[prev in list] [next in list] [prev in thread] [next in thread]