Minor correction in Pen.Dispose and SolidBrush.Dispose

svn path=/trunk/mcs/; revision=28624

diff --git a/mcs/class/System.Drawing/System.Drawing/Pen.cs b/mcs/class/System.Drawing/System.Drawing/Pen.cs
index c5576ec871e9b7302aff0a0bf87d8b85c5e93f0b..cd814cfcb321983c7727ee55fd1c06bee1671190 100755 (executable)
--- a/mcs/class/System.Drawing/System.Drawing/Pen.cs
+++ b/mcs/class/System.Drawing/System.Drawing/Pen.cs
@@ -424,13 +424,15 @@ namespace System.Drawing {
                        // Pen is disposed if and only if it is not disposed and
                        // it is modifiable OR it is not disposed and it is being
                        // collected by GC.
-                       if ((disposed == false) && (isModifiable || disposing == false)) {
-                               Status status = GDIPlus.GdipDeletePen (nativeObject);
-                               GDIPlus.CheckStatus (status);
-                               disposed = true;
+                       if (! disposed) {
+                               if (isModifiable || disposing == false) {
+                                       Status status = GDIPlus.GdipDeletePen (nativeObject);
+                                       GDIPlus.CheckStatus (status);
+                                       disposed = true;
+                               }
+                               else
+                                       throw new ArgumentException ("This Pen object can't be modified.");
                        }
-                       else
-                               throw new ArgumentException ("This Pen object can't be modified.");
                }
 
                ~Pen ()

diff --git a/mcs/class/System.Drawing/System.Drawing/SolidBrush.cs b/mcs/class/System.Drawing/System.Drawing/SolidBrush.cs
index c6e4faab3b0daea897a8dcf1bff7a40a13c55abb..43224f3a703a69358808cc0750f09fdb6c447098 100644 (file)
--- a/mcs/class/System.Drawing/System.Drawing/SolidBrush.cs
+++ b/mcs/class/System.Drawing/System.Drawing/SolidBrush.cs
@@ -66,13 +66,15 @@ namespace System.Drawing
                        // SolidBrush is disposed if and only if it is not disposed
                        // and it is modifiable OR it is not disposed and it is being
                        // collected by GC.
-                       if ((disposed == false) && (isModifiable || disposing == false)) {
-                               Status status = GDIPlus.GdipDeleteBrush (nativeObject);
-                               GDIPlus.CheckStatus (status);
-                               disposed = true;
+                       if (! disposed) {
+                               if (isModifiable || disposing == false) {
+                                       Status status = GDIPlus.GdipDeleteBrush (nativeObject);
+                                       GDIPlus.CheckStatus (status);
+                                       disposed = true;
+                               }
+                               else
+                                       throw new ArgumentException ("This SolidBrush object can't be modified.");
                        }
-                       else
-                               throw new ArgumentException ("This SolidBrush object can't be modified.");
                }
        }
 }