Finished implementing removal of visited menuitems and reloading when list is empty.

RedditBar/AppDelegate.m

@@ -147,27 +147,33 @@
 -(void)openAndRemoveAndReloadWithIndex:(NSInteger)index Comments:(Boolean)comments Both:(Boolean)both {
     RedditItem *rItem = [redditItems objectAtIndex:index];
     NSString *url;
-    if (comments)
+    if (comments) {
         url = [rItem comments];
-    else
+        [rItem setVisitedComments:TRUE];
+    } else {
         url = [rItem link];
+        [rItem setVisitedLink:TRUE];
+    }
     [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:url]];
     if (both) {
-        if (!comments)
+        if (!comments) {
             url = [rItem comments];
-        else
+            [rItem setVisitedComments:TRUE];
+        } else {
             url = [rItem link];
+            [rItem setVisitedLink:TRUE];
+        }
         [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:url]];
     }
     
     if (currentState.removeVisited) {
-        // TODO remove selfpost, remove submenu if link & comments visited
-        //[statusMenu removeItem:[menuItems objectAtIndex:i]];
-        
-        Boolean removed = TRUE;
-        Boolean listNowEmpty = TRUE;
+        Boolean removed = FALSE;
+        if ((rItem.isSelf && (rItem.visitedLink || rItem.visitedComments)) || ((!rItem.isSelf) && rItem.visitedLink && rItem.visitedComments)) {
+            [statusMenu removeItem:[menuItems objectAtIndex:index]];
+            removed = TRUE;
+        }
         
-        if (removed && listNowEmpty) {
+        if (removed && ([statusMenu numberOfItems] <= 10)) {
             [self reloadNextList:nil];
         } else {
             if (removed && currentState.reloadAfterVisit) {
@@ -221,7 +227,9 @@
 -(void)clearMenuItems {
     if (menuItems != nil) {
         for (NSUInteger i = 0; i < [menuItems count]; i++) {
-            [statusMenu removeItem:[menuItems objectAtIndex:i]];
+            NSMenuItem *item = [menuItems objectAtIndex:i];
+            if ([statusMenu indexOfItem:item] != -1)
+                [statusMenu removeItem:item];
         }
         menuItems = nil;
     }

RedditBar/RedditBar-Info.plist

@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>290</string>
+	<string>298</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>

RedditBar/RedditItem.h

@@ -35,7 +35,8 @@
 @property (atomic, retain) NSString *link; // link itself
 @property (atomic, retain) NSString *comments; // link to comments, or nil if isSelf is true
 @property (atomic) BOOL isSelf; // link or selfpost
-@property (atomic) NSInteger visitedCount; // used to keep track if both link & comments were opened to then remove item
+@property (atomic) BOOL visitedLink;
+@property (atomic) BOOL visitedComments;
 
 +(RedditItem *)itemWithName:(NSString *)name Link:(NSString *)link Comments:(NSString *)comments Self:(BOOL)isSelf;
 

RedditBar/RedditItem.m

@@ -30,7 +30,7 @@
 
 @implementation RedditItem
 
-@synthesize name, fullName, link, comments, isSelf, visitedCount;
+@synthesize name, fullName, link, comments, isSelf, visitedLink, visitedComments;
 
 +(RedditItem *)itemWithName:(NSString *)name Link:(NSString *)link Comments:(NSString *)comments Self:(BOOL)isSelf {
     RedditItem *i = [[RedditItem alloc] init];
@@ -38,7 +38,8 @@
     [i setLink:link];
     [i setComments:comments];
     [i setIsSelf:isSelf];
-    [i setVisitedCount:0];
+    [i setVisitedLink:FALSE];
+    [i setVisitedComments:FALSE];
     return i;
 }