summaryrefslogtreecommitdiff
path: root/scheduler/type.c
diff options
context:
space:
mode:
authormsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>2009-01-14 19:55:19 +0000
committermsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>2009-01-14 19:55:19 +0000
commitd2354e63977f1d0386a8d5724db2ec90fb666824 (patch)
treea79c2dacfa8a2f152008b4cd7dbc9aa503af01e3 /scheduler/type.c
parentc168a833caab4209bdb0035d8918207d40013591 (diff)
downloadcups-d2354e63977f1d0386a8d5724db2ec90fb666824.tar.gz
Merge changes from CUPS 1.4svn-r8252.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1123 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'scheduler/type.c')
-rw-r--r--scheduler/type.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/scheduler/type.c b/scheduler/type.c
index c334e99eb..6218b4d6f 100644
--- a/scheduler/type.c
+++ b/scheduler/type.c
@@ -188,8 +188,7 @@ mimeAddTypeRule(mime_type_t *mt, /* I - Type to add to */
else if (*rule == '+' && current != NULL)
{
if (logic != MIME_MAGIC_AND &&
- current != NULL && current->prev != NULL &&
- current->prev->prev != NULL)
+ current != NULL && current->prev != NULL)
{
/*
* OK, we have more than 1 rule in the current tree level... Make a