From 2be56e7576f77794da73d4c18213892b82b7215c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= <korli@users.berlios.de>
Date: Sat, 12 Apr 2008 07:58:43 +0000
Subject: [PATCH] Applied patch from n3s: the check for file extension was
 broken. Thanks! This fixes bug #2034

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@24930 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/apps/expander/ExpanderRules.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/apps/expander/ExpanderRules.cpp b/src/apps/expander/ExpanderRules.cpp
index c9db80d293..2bdff15ca1 100644
--- a/src/apps/expander/ExpanderRules.cpp
+++ b/src/apps/expander/ExpanderRules.cpp
@@ -124,8 +124,11 @@ ExpanderRules::MatchingRule(BString &fileName, const char *filetype)
 	int32 length = fileName.Length();
 	for (int32 i = 0; i < count; i++) {
 		ExpanderRule *rule = (ExpanderRule *)fList.ItemAt(i);
-		if ((rule->MimeType().IsValid() && rule->MimeType() == filetype)
-			|| (fileName.FindLast(rule->FilenameExtension()) == (length - rule->FilenameExtension().Length())))
+		if (rule->MimeType().IsValid() && rule->MimeType() == filetype)
+			return rule;
+		int32 extPosition = fileName.FindLast(rule->FilenameExtension());
+		if (extPosition != -1 
+			&& extPosition == (length - rule->FilenameExtension().Length()))
 			return rule;
 	}
 	return NULL;