Merge branch 'development'

Conflicts: MUSHclient/worlds/plugins/aard_layout.xml
fiendish · May 24, 2017 · 8c4afc9 · 8c4afc9
2 parents 3de6b9f + d35b380
commit 8c4afc9
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/MUSHclient/worlds/plugins/aard_layout.xml b/MUSHclient/worlds/plugins/aard_layout.xml
@@ -286,7 +286,7 @@ end
 
 function check_geometry()
    if (GetOption("auto_resize_command_window") == 1) and (GetCommand() == "") then
-      SetCommandWindowHeight(GetInfo(214) + 4)
+      SetCommandWindowHeight((GetOption("auto_resize_minimum_lines") * GetInfo(214)) + 4)
    end
 
    textrect_top = math.max(0, tonumber(GetVariable("trtop")) or default_top)