Rearrange filter logic

Fixes #2

src/rugby-app-window.c

@@ -78,18 +78,19 @@ filter_visible_func (GtkTreeModel *model,
                         RUGBY_SCORE_STORE_KICKS, &kicks,
                         -1);
 
-    gboolean try = gtk_switch_get_active (GTK_SWITCH (self->tryfilter));
-    gboolean kick = gtk_switch_get_active (GTK_SWITCH (self->kickfilter));
-
-    if (try && kick)
-        return ((tries + utries == ftries) && (kicks == fkicks)) ? TRUE : FALSE;
-    else if (try)
-        return (tries + utries) == ftries ? TRUE : FALSE;
-    else if (kick)
-        return (kicks == fkicks) ? TRUE : FALSE;
+    gboolean try_filter = gtk_switch_get_active (GTK_SWITCH (self->tryfilter));
+    gboolean kick_filter = gtk_switch_get_active (GTK_SWITCH (self->kickfilter));
+    gboolean try_equal = ((tries + utries) == ftries);
+    gboolean kick_equal = (kicks == fkicks);
+
+    if (try_filter && kick_filter)
+        return try_equal && kick_equal;
+    else if (try_filter)
+        return try_equal;
+    else if (kick_filter)
+        return kick_equal;
     else
         return TRUE;
-
 }
 
 static void