merge

1 files changed, 6 insertions, 0 deletions

diff --git a/public/assets/javascripts/rectangles/engine/scenery/move.js b/public/assets/javascripts/rectangles/engine/scenery/move.js
index 12705d3..f57ddba 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/move.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/move.js
@@ -14,6 +14,7 @@ Scenery.move = function(base){
 	}
 
 	this.unbind = function(){
+	  base.focused = false
 		Scenery.mouse.unbind_el(base.mx.el)
 		Scenery.mouse.off("down", down)
 		Scenery.mouse.off("enter", switch_wall)
@@ -31,6 +32,11 @@ Scenery.move = function(base){
 		// load the modal
 		app.controller.pick(base)
 
+    if (! base.focused) {
+			e.clickAccepted = false
+			base.focused = true
+			return
+    }
 		if (! (editor.permissions.move || editor.permissions.resize) ) {
 			e.clickAccepted = false
 			return