Changeset 3417 for trunk/sources/HeuristicLab.MainForm.WindowsForms/3.2/View.cs

Timestamp:

04/19/10 21:09:25 (15 years ago)

Author:

mkommend

Message:

corrected bug in OnClosing of views (ticket #982)

File:

• trunk/sources/HeuristicLab.MainForm.WindowsForms/3.2/View.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.MainForm.WindowsForms/3.2/View.cs

@@ -151 +151 @@
         Type controlType = c.GetType();
         PropertyInfo controlPropertyInfo = controlType.GetProperty(propertyInfo.Name, propertyInfo.PropertyType);
-        if (type.IsAssignableFrom(controlType) && controlPropertyInfo!= null) {
+        if (type.IsAssignableFrom(controlType) && controlPropertyInfo != null) {
           var thisValue = propertyInfo.GetValue(this, null);
           controlPropertyInfo.SetValue(c, thisValue, null);
@@ -183 +183 @@
     internal void OnClosingHelper(object sender, FormClosingEventArgs e) {
       FormClosingEventArgs eventArgs = new FormClosingEventArgs(this.closeReason, e.Cancel);
-      if (this.closeReason != CloseReason.None)
+      if (this.closeReason != CloseReason.None) {
         this.OnClosing(eventArgs);
-      else
+        if (eventArgs.Cancel != e.Cancel)
+          e.Cancel = eventArgs.Cancel;
+      } else
         this.OnClosing(e);
-
-      if (eventArgs.Cancel != e.Cancel)
-        e.Cancel = eventArgs.Cancel;
       this.closeReason = CloseReason.None;
     }