From 0f9612b69f6603026438318d2a24f82eddad0711 Mon Sep 17 00:00:00 2001
From: Kienz <stefankienzle.de@gmail.com>
Date: Tue, 22 Oct 2013 20:33:20 +0200
Subject: [PATCH] Fix object selection with shift key - Closes issue #912

---
 src/canvas.class.js               | 2 ++
 src/mixins/canvas_events.mixin.js | 5 +++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/canvas.class.js b/src/canvas.class.js
index 64da852a..850e6e3a 100644
--- a/src/canvas.class.js
+++ b/src/canvas.class.js
@@ -479,6 +479,8 @@
           if (activeGroup.size() === 1) {
             // remove group alltogether if after removal it only contains 1 object
             this.discardActiveGroup();
+            // activate last remaining object
+            this.setActiveObject(activeGroup.item(0));
           }
         }
         else {
diff --git a/src/mixins/canvas_events.mixin.js b/src/mixins/canvas_events.mixin.js
index 4a810ddc..15ab7473 100644
--- a/src/mixins/canvas_events.mixin.js
+++ b/src/mixins/canvas_events.mixin.js
@@ -166,11 +166,12 @@
     _shouldRender: function(target, pointer) {
       var activeObject = this.getActiveGroup() || this.getActiveObject();
 
-      return (
+      return !!(
         (target && (
         target.isMoving ||
         target !== activeObject)) ||
-        (!target && activeObject) ||
+        (!target && !!activeObject) ||
+        (!target && !activeObject && !this._groupSelector) ||
         (pointer &&
         this._previousPointer &&
         this.selection && (