diff options
author | waker <wakeroid@gmail.com> | 2012-04-09 16:29:23 +0200 |
---|---|---|
committer | waker <wakeroid@gmail.com> | 2012-04-09 16:29:23 +0200 |
commit | 516f25073a726709abb83c3b73bd1e53404514c9 (patch) | |
tree | 68113731910c0df756717191a9cfaf55be514130 /plugins/gtkui/plcommon.c | |
parent | 6502057510696ea575a1cf0143dec02acb7cf01c (diff) | |
parent | 1ed51a80ec0979bc0be453f75548c59965fbd6f5 (diff) |
Merge branch 'master' into devel
Conflicts:
plugins/gtkui/callbacks.c
plugins/gtkui/callbacks.h
plugins/gtkui/gtkui.h
Diffstat (limited to 'plugins/gtkui/plcommon.c')
-rw-r--r-- | plugins/gtkui/plcommon.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/gtkui/plcommon.c b/plugins/gtkui/plcommon.c index 64f45d6d..748bd90b 100644 --- a/plugins/gtkui/plcommon.c +++ b/plugins/gtkui/plcommon.c @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko <waker@users.sourceforge.net> + Copyright (C) 2009-2012 Alexey Yakovenko <waker@users.sourceforge.net> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -506,7 +506,7 @@ list_context_menu (DdbListview *listview, DdbListviewIter it, int idx) { int count = 0; for (action = actions; action; action = action->next) { - if (action->flags & DB_ACTION_COMMON) + if (action->flags & (DB_ACTION_COMMON | DB_ACTION_PLAYLIST)) continue; // create submenus (separated with '/') |