Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasSuperModel.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasSuperModel.as,v
diff -u -r1.18 -r1.19
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasSuperModel.as	25 Feb 2008 04:18:01 -0000	1.18
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasSuperModel.as	27 Feb 2008 03:14:25 -0000	1.19
@@ -165,21 +165,25 @@
 			tActivities.addItem({label: "--Selection--", data: 0});	 // TODO: Label required
 		
 		while(_activityUIID != null) {
-			
+
 			var transObj:Object = getCanvas().ddm.getTransitionsForActivityUIID(_activityUIID);
 		
 			_activity = (transObj.into != null) ? _cv.ddm.getActivityByUIID(transObj.into.fromUIID) : getParentActivity(_activity);
 			
-			if(_activity != null) {
+			if (_activity != null) {
 				if(_activity instanceof _class) {
 					if(isBranching) tActivities.addItem({label: _activity.title, data: _activity.activityUIID});
 					else tActivities.addItem({label: _activity.title, data: _activity});
 				} else if(_activity instanceof ComplexActivity) {
-					if(!isBranching && !_activity.isOptionalActivity() && !_activity.isSequenceActivity())
-						getActivitiesFromComplexByClass(_activity.activityUIID, tActivities, _class, isBranching);
-					else if(isBranching && !_activity.isOptionalActivity() && !_activity.isOptionsWithSequencesActivity())
-						getActivitiesFromComplexByClass(_activity.activityUIID, tActivities, _class, isBranching);
+					var _seqActivity = getCanvas().ddm.getActivityByUIID(selectedItem.activity.parentUIID);
+					
+					if(_activity.activityUIID != _seqActivity.activityUIID && _activity.activityUIID != _seqActivity.parentUIID) {
 						
+						if(!isBranching && !_activity.isOptionalActivity() && !_activity.isSequenceActivity())
+							getActivitiesFromComplexByClass(_activity.activityUIID, tActivities, _class, isBranching);
+						else if(isBranching && !_activity.isOptionalActivity() && !_activity.isOptionsWithSequencesActivity())
+							getActivitiesFromComplexByClass(_activity.activityUIID, tActivities, _class, isBranching);
+					}
 				}
 			}