From c1a9b9773542b5a5de771a06a20834f38bb2da90 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Tue, 15 Mar 2016 22:38:20 +0100
Subject: fix-bug-1557192. paint-order crash with multiple items

Fixed bugs:
  - https://launchpad.net/bugs/1557192

(bzr r14708)
---
 src/desktop-style.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/desktop-style.cpp')

diff --git a/src/desktop-style.cpp b/src/desktop-style.cpp
index c28302d22..d10c75cd8 100644
--- a/src/desktop-style.cpp
+++ b/src/desktop-style.cpp
@@ -1004,10 +1004,10 @@ objects_query_paintorder (const std::vector<SPItem*> &objects, SPStyle *style_re
 
         n_order ++;
 
-        if (!prev_order.empty() && prev_order.compare( style->paint_order.value ) != 0) {
-            same_order = false;
-        }
         if (style->paint_order.set) {
+            if (!prev_order.empty() && prev_order.compare( style->paint_order.value ) != 0) {
+                same_order = false;
+            }
             prev_order = style->paint_order.value;
         }
     }
-- 
cgit v1.2.3