From 63cc73b5696e374112ab0c08954ed6655490fcc9 Mon Sep 17 00:00:00 2001
From: Matthias Koefferlein <matthias@koefferlein.de>
Date: Sun, 8 Dec 2019 08:43:08 +0100
Subject: [PATCH] Fixed #445 (cryptic message when instances are selected and
 'merge shapes' is used)

---
 src/edt/edt/edtMainService.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/edt/edt/edtMainService.cc b/src/edt/edt/edtMainService.cc
index 67d3fd24d..78c1f0329 100644
--- a/src/edt/edt/edtMainService.cc
+++ b/src/edt/edt/edtMainService.cc
@@ -1641,7 +1641,7 @@ MainService::boolean_op (int mode)
 
   for (std::vector<edt::Service *>::const_iterator es = edt_services.begin (); es != edt_services.end (); ++es) {
     for (edt::Service::obj_iterator s = (*es)->selection ().begin (); s != (*es)->selection ().end (); ++s) {
-      if (int (s->layer ()) == layer_index && ! s->is_cell_inst () && (s->shape ().is_polygon () || s->shape ().is_path () || s->shape ().is_box ())) {
+      if (! s->is_cell_inst () && int (s->layer ()) == layer_index && (s->shape ().is_polygon () || s->shape ().is_path () || s->shape ().is_box ())) {
         db::Cell &cell = view ()->cellview (s->cv_index ())->layout ().cell (s->cell_index ());
         if (cell.shapes (s->layer ()).is_valid (s->shape ())) {
           cell.shapes (s->layer ()).erase_shape (s->shape ());