This repository was archived by the owner on Oct 16, 2020. It is now read-only.
File tree Expand file tree Collapse file tree
src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Extensions Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -180,24 +180,28 @@ void CreateSurface(PlacementOperation operation)
180180
181181 private IEnumerable < DesignItem > AllDesignItems ( DesignItem designItem = null )
182182 {
183- if ( designItem == null )
183+ if ( designItem == null && this . ExtendedItem . Services . DesignPanel is DesignPanel )
184184 {
185185 designItem = this . ExtendedItem . Services . DesignPanel . Context . RootItem ;
186- yield return designItem ;
187- if ( designItem . ContentProperty . Value != null ) {
188- yield return designItem . ContentProperty . Value ;
189- designItem = designItem . ContentProperty . Value ;
186+ if ( designItem != null ) {
187+ yield return designItem ;
188+ if ( designItem . ContentProperty . Value != null ) {
189+ yield return designItem . ContentProperty . Value ;
190+ designItem = designItem . ContentProperty . Value ;
191+ }
190192 }
191193 }
192194
193- if ( designItem . ContentProperty != null && designItem . ContentProperty . IsCollection )
195+ if ( designItem != null && designItem . ContentProperty != null && designItem . ContentProperty . IsCollection )
194196 foreach ( var collectionElement in designItem . ContentProperty . CollectionElements )
195197 {
196- yield return collectionElement ;
198+ if ( collectionElement != null )
199+ yield return collectionElement ;
197200
198201 foreach ( var el in AllDesignItems ( collectionElement ) )
199202 {
200- yield return el ;
203+ if ( el != null )
204+ yield return el ;
201205 }
202206 }
203207 }
@@ -365,3 +369,4 @@ class Snapline
365369 }
366370 }
367371}
372+
You can’t perform that action at this time.
0 commit comments