Bug Fix: Rework playlist setup again

In case playlist setup is reset or not, move the reset above the menu setup code, so the menu is set up correctly if a reset occurs. Signed-off-by: Christopher Snowhill <[email protected]>
losnoco · Feb 16, 2025 · b8698ea · b8698ea
1 parent f239784
commit b8698ea
Showing 1 changed file with 20 additions and 16 deletions.
diff --git a/Playlist/PlaylistView.m b/Playlist/PlaylistView.m
@@ -111,6 +111,26 @@ - (void)awakeFromNib {
 		}
 	}
 
+	int visibleTableColumns = 0;
+	columns = [self tableColumns];
+	for (NSTableColumn *col in columns) {
+		visibleTableColumns += ![col isHidden];
+	}
+
+	if(visibleTableColumns == 0) {
+		// Reset to defaults
+		NSString *message = @"Reset playlist columns to default";
+		DLog(@"%@", message);
+		[[FIRCrashlytics crashlytics] logWithFormat:@"%@", message];
+		for(NSTableColumn *col in columns) {
+			[self removeTableColumn:col];
+		}
+		columns = oldColumns;
+		for(NSTableColumn *col in columns) {
+			[self addTableColumn:col];
+		}
+	}
+
 	columns = [self tableColumns];
 
 	for(NSTableColumn *col in columns) {
@@ -127,7 +147,6 @@ - (void)awakeFromNib {
 	                                                               ascending:YES];
 	NSArray *sortDescriptors = @[sortDescriptor];
 
-	int visibleTableColumns = 0;
 	int menuIndex = 0;
 	for(NSTableColumn *col in [columns sortedArrayUsingDescriptors:sortDescriptors]) {
 		NSString *title;
@@ -149,24 +168,9 @@ - (void)awakeFromNib {
 		[contextMenuItem setRepresentedObject:col];
 		[contextMenuItem setState:([col isHidden] ? NSControlStateValueOff : NSControlStateValueOn)];
 
-		visibleTableColumns += ![col isHidden];
 		menuIndex++;
 	}
 
-	if(visibleTableColumns == 0) {
-		// Reset to defaults
-		NSString *message = @"Reset playlist columns to default";
-		DLog(@"%@", message);
-		[[FIRCrashlytics crashlytics] logWithFormat:@"%@", message];
-		for(NSTableColumn *col in columns) {
-			[self removeTableColumn:col];
-		}
-		columns = oldColumns;
-		for(NSTableColumn *col in columns) {
-			[self addTableColumn:col];
-		}
-	}
-
 	[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(tableColumnsResized) name:NSTableViewColumnDidResizeNotification object:nil];
 	[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(tableColumnsMoved) name:NSTableViewColumnDidMoveNotification object:nil];