Merge branch 'development' into MUSHclient

fiendish · Oct 17, 2017 · 740cd82 · 740cd82
2 parents a631aab + f45d1a8
commit 740cd82
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/MUSHclient/AardwolfPackageChanges.txt b/MUSHclient/AardwolfPackageChanges.txt
@@ -1,5 +1,8 @@
 Aardwolf Client Package Major Changes List
 
+r1938 snapshot
+- bug fix: Don't only lock miniwindow positions (when using aard layout lock) if they have a preprocessor function defined.
+
 r1937 snapshot
 - bug fix: Remove an innocuous but scary looking and unnecessary alert message in the movewindow code.
 

diff --git a/MUSHclient/lua/movewindow.lua b/MUSHclient/lua/movewindow.lua
@@ -164,10 +164,8 @@ local function make_dragmove_handler (mwi)
     local win = mwi.win
 
     -- see if other action wanted
-    if mwi.preprocess.dragmove then
-      if (GetPluginVariable("c293f9e7f04dde889f65cb90", "lock_down_miniwindows") == "1") or mwi.preprocess.dragmove (flags, hotspot_id, win) then
-         return
-      end -- if handled already
+    if (GetPluginVariable("c293f9e7f04dde889f65cb90", "lock_down_miniwindows") == "1")  or (mwi.preprocess.dragmove and mwi.preprocess.dragmove(flags, hotspot_id, win)) then
+       return
     end -- if handler
 
     -- find where it is now