Merge branch 'master' into muc_roles

Conflicts: .gitignore
2014-09-30 20:46:26 +01:00
parent 0365e88b7b fbeb107cbe
commit bca5a5f78d
3 changed files with 56 additions and 52 deletions
--- a/src/ui/core.c
+++ b/src/ui/core.c
@@ -2034,7 +2034,7 @@ _ui_show_form(ProfWin *window, const char * const room, DataForm *form)
    while (curr_field != NULL) {
        FormField *field = curr_field->data;

-        if (g_strcmp0(field->type, "hidden") != 0) {
+        if (g_strcmp0(field->type, "hidden") != 0 && field->var) {
            char *tag = g_hash_table_lookup(form->var_to_tag, field->var);
            _ui_handle_form_field(window, tag, field);
        }