merge branch 'development' into MUSHclient

fiendish · Apr 4, 2018 · 3162f3e · 3162f3e
2 parents 4296bd1 + 5f08721
commit 3162f3e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/MUSHclient/AardwolfPackageChanges.txt b/MUSHclient/AardwolfPackageChanges.txt
@@ -1,5 +1,8 @@
 Aardwolf Client Package Major Changes List
 
+r1983 snapshot
+- bug fix: This should prevent an error message from the mapper during resetaard calls.
+
 r1982 snapshot
 - bug fix: The #sub/#gag plugin will politely decline invalid patterns instead of entering an endless cycle of errors.
 

diff --git a/MUSHclient/lua/aardmapper.lua b/MUSHclient/lua/aardmapper.lua
@@ -110,7 +110,7 @@ function reset_pos()
    config.WINDOW.width = default_width
    config.WINDOW.height = default_height
    WindowPosition(win, default_x, default_y, 0, 18)
-   WindowResize(win, default_width, default_height, config.BACKGROUND_COLOUR.colour)
+   WindowResize(win, default_width, default_height, BACKGROUND_COLOUR.colour)
    Repaint() -- hack because WindowPosition doesn't immediately update coordinates
 end