Merge branch 'development' into MUSHclient

fiendish · Nov 16, 2016 · e580f2a · e580f2a
2 parents e86c041 + 0099a28
commit e580f2a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/MUSHclient/AardwolfPackageChanges.txt b/MUSHclient/AardwolfPackageChanges.txt
@@ -1,5 +1,8 @@
 Aardwolf Client Package Major Changes List
 
+r1887 snapshot:
+- bug fix: GMCP mapper notes display was disfigured by MUSHclient's new deferred noting in callbacks
+
 r1886 snapshot:
 - bug fix: recent color improvements introduced a color bleed that is now fixed.
 - bug fix: changing ANSI color display settings could in some instances cause an error message during some color conversion routines.

diff --git a/MUSHclient/worlds/plugins/aard_GMCP_mapper.xml b/MUSHclient/worlds/plugins/aard_GMCP_mapper.xml
@@ -3410,9 +3410,8 @@ function got_gmcp_room()
    if not compact_mode then check_compact = "\n" end
 
    if shownotes and room and room.notes and room.notes ~= "" then
-      for _,v in ipairs(ColoursToStyles("*** MAPPER NOTE *** -> "..room.notes.."@w\n"..check_compact, "x033")) do
-         ColourTell(RGBColourToName(v.textcolour), RGBColourToName(v.backcolour), v.text)
-      end
+      Simulate("") -- work around the annoying Note deferral in callbacks
+      AnsiNote(ColoursToANSI("@x033*** MAPPER NOTE *** -> "..room.notes.."@w"..check_compact))
    end
 
    -- re-save if we got information that is different than before