Skip to content

Commit

Permalink
protect against items that have been removed
Browse files Browse the repository at this point in the history
---
yaml
---
svn_rev: 57020
current_ref: refs/heads/CMSSW_7_0_X
current_commit: 1659a24
head_branch: refs/heads/CMSSW_7_0_X
migrated_from: v3
  • Loading branch information
Dr15Jones committed Dec 9, 2008
1 parent 0e2fe5d commit 3818280
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/CMSSW_7_0_X: 9ff7b2b23e334abd60a7deeaadd5b062adf02288
refs/heads/CMSSW_7_0_X: 1659a24acbc38cc0cfd9255bbc85acba75e0a37e
10 changes: 5 additions & 5 deletions trunk/Fireworks/Core/src/FWEventItem.cc
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
//
// Original Author:
// Created: Thu Jan 3 14:59:23 EST 2008
// $Id: FWEventItem.cc,v 1.29 2008/12/01 01:00:13 chrjones Exp $
// $Id: FWEventItem.cc,v 1.30 2008/12/06 02:38:15 chrjones Exp $
//

// system include files
Expand Down Expand Up @@ -298,7 +298,7 @@ FWEventItem::moveToFront()
itEnd = m_context->eventItemsManager()->end();
it != itEnd;
++it) {
if((*it)->layer() > largest) {
if( (*it) && (*it)->layer() > largest) {
largest= (*it)->layer();
}
}
Expand All @@ -323,7 +323,7 @@ FWEventItem::moveToBack()
itEnd = m_context->eventItemsManager()->end();
it != itEnd;
++it) {
if((*it)->layer() < smallest) {
if( (*it) && (*it)->layer() < smallest) {
smallest= (*it)->layer();
}
}
Expand Down Expand Up @@ -457,7 +457,7 @@ FWEventItem::isInFront() const
itEnd = m_context->eventItemsManager()->end();
it != itEnd;
++it) {
if((*it)->layer() > layer()) {
if((*it) && (*it)->layer() > layer()) {
return false;
}
}
Expand All @@ -472,7 +472,7 @@ FWEventItem::isInBack() const
itEnd = m_context->eventItemsManager()->end();
it != itEnd;
++it) {
if((*it)->layer() < layer()) {
if((*it) && (*it)->layer() < layer()) {
return false;
}
}
Expand Down

0 comments on commit 3818280

Please sign in to comment.