From 1beadac96796f945a1afedd92fed6f58c4344e64 Mon Sep 17 00:00:00 2001
From: Randy Baumgarte <randy@fbn.cx>
Date: Fri, 14 Jan 2011 13:57:34 -0500
Subject: [PATCH] Correct problem where conflict notebooks were not the proper
 color.

---
 src/cx/fbn/nevernote/gui/NotebookTreeWidget.java | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/cx/fbn/nevernote/gui/NotebookTreeWidget.java b/src/cx/fbn/nevernote/gui/NotebookTreeWidget.java
index 7926fa1..807802c 100644
--- a/src/cx/fbn/nevernote/gui/NotebookTreeWidget.java
+++ b/src/cx/fbn/nevernote/gui/NotebookTreeWidget.java
@@ -164,15 +164,14 @@ public class NotebookTreeWidget extends QTreeWidget {
     	QIcon redIcon = new QIcon(iconPath+"notebook-red.png");
     	QIcon yellowIcon = new QIcon(iconPath+"notebook-yellow.png");
     	QIcon orangeIcon = new QIcon(iconPath+"notebook-orange.png");
-
-		if (localBooks.contains(guid)) {
-			return yellowIcon;
-		}
 		
 		if (localBooks.contains(guid) && 
 			(name.equalsIgnoreCase("Conflicting Changes") ||
 			 name.equalsIgnoreCase("Conflicting Changes (Local)")))
 				return redIcon;
+		if (localBooks.contains(guid)) {
+			return yellowIcon;
+		}
 		if (isPublished)
 			return blueIcon;
 		
-- 
2.11.0