From 37e34a9f2a353558904423c96ddc23e2413413f3 Mon Sep 17 00:00:00 2001
From: Scott Jackson <daneren2005@gmail.com>
Date: Fri, 25 Jul 2014 23:10:15 -0700
Subject: #380 Put artist results before albums

---
 .../daneren2005/dsub/provider/DSubSearchProvider.java    | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

(limited to 'src/github')

diff --git a/src/github/daneren2005/dsub/provider/DSubSearchProvider.java b/src/github/daneren2005/dsub/provider/DSubSearchProvider.java
index 1da614af..01f08565 100644
--- a/src/github/daneren2005/dsub/provider/DSubSearchProvider.java
+++ b/src/github/daneren2005/dsub/provider/DSubSearchProvider.java
@@ -102,19 +102,29 @@ public class DSubSearchProvider extends ContentProvider {
 			public int compare(Object lhs, Object rhs) {
 				// Get the closeness of the two objects
 				int left, right;
-				if (lhs instanceof Artist) {
+				boolean leftArtist = lhs instanceof Artist;
+				boolean rightArtist = rhs instanceof Artist;
+				if (leftArtist) {
 					left = ((Artist) lhs).getCloseness();
 				} else {
 					left = ((MusicDirectory.Entry) lhs).getCloseness();
 				}
-				if (rhs instanceof Artist) {
+				if (rightArtist) {
 					right = ((Artist) rhs).getCloseness();
 				} else {
 					right = ((MusicDirectory.Entry) rhs).getCloseness();
 				}
 
 				if (left == right) {
-					return 0;
+					if(leftArtist && rightArtist) {
+						return 0;
+					} else if(leftArtist) {
+						return -1;
+					} else if(rightArtist) {
+						return 1;
+					} else {
+						return 0;
+					}
 				} else if (left > right) {
 					return 1;
 				} else {
-- 
cgit v1.2.3