Merge branch 'develop' of https://github.com/DFHack/dfhack into develop

2016-02-20 01:31:12 +05:30 · 2016-02-20 01:31:12 +05:30 · 420eb5341b
parent ac068b4738 f4ce45deae
commit 420eb5341b
2 changed files with 2 additions and 1 deletions
--- a/library/xml
+++ b/library/xml
@ -1 +1 @@
-Subproject commit 49eff8dca662bff83ff2191ac5b611504c72ae1c
+Subproject commit dd3e9e7f47a7991e91d5188546be107fdb61015b
--- a/plugins/lua/confirm.lua
+++ b/plugins/lua/confirm.lua
@ -178,6 +178,7 @@ note_delete = defconf('note-delete')
 function note_delete.intercept_key(key)
    return key == keys.D_NOTE_DELETE and
        ui.main.mode == df.ui_sidebar_mode.NotesPoints and
+        not ui.waypoints.in_edit_name_mode and
        not ui.waypoints.in_edit_text_mode
 end
 note_delete.title = "Delete note"