Changeset 5318

Timestamp:

01/18/11 09:48:37 (13 years ago)

Author:

mkommend

Message:

Corrected nested ViewHost check (ticket #1372).

File:

• trunk/sources/HeuristicLab.MainForm.WindowsForms/3.3/ViewHost.cs (modified) (1 diff)

trunk/sources/HeuristicLab.MainForm.WindowsForms/3.3/ViewHost.cs

@@ -109 +109 @@
       set {
         if (viewType != value) {
+          if (value == typeof(ViewHost))
+            throw new ArgumentException("Directly nested ViewHosts are not allowed.");
           if (value != null && Content != null && !ViewCanShowContent(value, Content))
-            throw new ArgumentException(string.Format("View \"{0}\" cannot display content \"{1}\".",                            value, Content.GetType()));
-          if (value != null && value.GetType() == typeof(ViewHost))
-            throw new ArgumentException("Directly nested ViewHosts are not allowed.");
+            throw new ArgumentException(string.Format("View \"{0}\" cannot display content \"{1}\".", value, Content.GetType()));
 
           viewType = value;