From e52ac44a1b8ae1124de257471ce7742045dd58fa Mon Sep 17 00:00:00 2001
From: rlx <0x0073@0x2620.org>
Date: Wed, 5 Sep 2012 09:29:06 +0000
Subject: [PATCH] On maps, only allow for creating combined places via
 shift-click or meta-click if the map is editable

---
 source/Ox.UI/js/Map/MapMarker.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/source/Ox.UI/js/Map/MapMarker.js b/source/Ox.UI/js/Map/MapMarker.js
index 0b1be55e..17e28165 100644
--- a/source/Ox.UI/js/Map/MapMarker.js
+++ b/source/Ox.UI/js/Map/MapMarker.js
@@ -53,7 +53,10 @@ Ox.MapMarker = function(options) {
         var key = that.map.getKey(),
             place, bounds, southWest, northEast;
         if (!that.place.selected) {
-            if (key == 'meta' || key == 'shift') {
+            if (
+                that.map.options('editable')
+                && (key == 'meta' || key == 'shift')
+            ) {
                 place = that.map.getSelectedPlace();
             }
             if (place) {