[Xfce4-commits] [xfce/thunar] 01/02: Prevent Gtk-CRITICAL when adding or modifying a user customizable action.

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

a   n   d   r   e       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository xfce/thunar.

commit 0cfd8d96fd4c1846b42927a71ada062cae25ac23
Author: Reuben Green <reubengreen73 at gmail.com>
Date:   Tue Sep 17 14:57:27 2019 +0100

    Prevent Gtk-CRITICAL when adding or modifying a user customizable action.
    
    Bug #15970
    
    Adds a check for a NULL value which occurs when adding a new user customizable
    action or adding a keyboard shortcut to one which previously did not have one.
    This NULL value itself is not an error, since it indicates the abscence of an
    existing shortcut, but the lack of this check causes a Gtk-CRITICAL error.
---
 plugins/thunar-uca/thunar-uca-editor.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/thunar-uca/thunar-uca-editor.c b/plugins/thunar-uca/thunar-uca-editor.c
index 58ac524..9bc8075 100644
--- a/plugins/thunar-uca/thunar-uca-editor.c
+++ b/plugins/thunar-uca/thunar-uca-editor.c
@@ -655,7 +655,7 @@ thunar_uca_editor_save (ThunarUcaEditor *uca_editor,
                       -1);
 
   /* always clear the accelerator, it'll be updated in thunar_uca_model_update */
-  if (gtk_accel_map_lookup_entry (uca_editor->accel_path, &key) && key.accel_key != 0)
+  if (uca_editor->accel_path != NULL && gtk_accel_map_lookup_entry (uca_editor->accel_path, &key) && key.accel_key != 0)
     gtk_accel_map_change_entry (uca_editor->accel_path, 0, 0, TRUE);
 
   thunar_uca_model_update (uca_model, iter,

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.