o Previous merge had too many issues. Hence all files in .../xorg/X11R7.6/rdp were copied

  from master branch and then astyle was run on the files

1 files changed, 15 insertions, 21 deletions

diff --git a/xorg/X11R7.6/rdp/rdpPolyFillArc.c b/xorg/X11R7.6/rdp/rdpPolyFillArc.c
index f3fd27ef..3941cb50 100644
--- a/xorg/X11R7.6/rdp/rdpPolyFillArc.c
+++ b/xorg/X11R7.6/rdp/rdpPolyFillArc.c
@@ -148,33 +148,27 @@ rdpPolyFillArc(DrawablePtr pDrawable, GCPtr pGC, int narcs, xArc *parcs)
             if (pDstWnd->viewable)
             {
                 post_process = 1;
-                rdpup_get_screen_image_rect(&id);
-                got_id = 1;
+
+                if (g_do_dirty_ons)
+                {
+                    LLOGLN(0, ("rdpPolyFillArc: gettig dirty"));
+                    g_screenPriv.is_dirty = 1;
+                    pDirtyPriv = &g_screenPriv;
+                    dirty_type = RDI_IMGLL;
+                }
+                else
+                {
+                    rdpup_get_screen_image_rect(&id);
+                    got_id = 1;
+                }
             }
         }
     }
 
     if (!post_process)
     {
-        pDstWnd = (WindowPtr)pDrawable;
-
-        if (pDstWnd->viewable)
-        {
-            post_process = 1;
-
-            if (g_do_dirty_ons)
-            {
-                LLOGLN(0, ("rdpPolyFillArc: gettig dirty"));
-                g_screenPriv.is_dirty = 1;
-                pDirtyPriv = &g_screenPriv;
-                dirty_type = RDI_IMGLL;
-            }
-            else
-            {
-                rdpup_get_screen_image_rect(&id);
-                got_id = 1;
-            }
-        }
+        g_free(rects);
+        return;
     }
 
     RegionInit(&clip_reg, NullBox, 0);