From 1d8ab840dc69ee2ff28eca8f8c42dc950944b03c Mon Sep 17 00:00:00 2001
From: Aparajita Fishman <aparajita@vasudevaserver.org>
Date: Tue, 27 Jul 2010 14:14:45 -0400
Subject: [PATCH] Another shot at fixing #776

---
 AppKit/CPTheme.j | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/AppKit/CPTheme.j b/AppKit/CPTheme.j
index e408a47a5..ef4c3118c 100644
--- a/AppKit/CPTheme.j
+++ b/AppKit/CPTheme.j
@@ -363,15 +363,18 @@ CPThemeStateCircular        = CPThemeState("circular");
                 }
             }
         }
-    }
 
+        if (value === undefined || value === nil)
+          value = [_parentAttribute valueForState:aState];
+
+        // Still don't have a value? OK, let's use the normal value.
+        if (value === undefined || value === nil)
+            value = [_values objectForKey:String(CPThemeStateNormal)];
+    }
+  
     if (value === undefined || value === nil)
         value = [_parentAttribute valueForState:aState];
-
-    // Still don't have a value? OK, let's use the normal value.
-    if (value === undefined || value === nil)
-        value = [_values objectForKey:String(CPThemeStateNormal)];
-
+  
     if (value === undefined || value === nil)
         value = _defaultValue;