modules/gui/macosx/library/VLCLibraryAudioDataSource.m

@@ -200,7 +200,7 @@
 {
     [self.segmentedControl setTarget:self];
     [self.segmentedControl setAction:@selector(segmentedControlAction:)];
-    [self segmentedControlAction:self];
+    [self segmentedControlAction:[[[VLCMain sharedInstance] libraryWindow] navigationStack]];
 }
 
 - (void)reloadEmptyViewAppearance

modules/gui/macosx/library/VLCLibraryNavigationStack.h

@@ -28,7 +28,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface VLCLibraryNavigationStack : NSObject
 
-@property (readwrite, strong) VLCLibraryWindow *delegate;
+@property (readwrite, nonatomic) VLCLibraryWindow *delegate;
 @property (readonly) BOOL forwardsAvailable;
 @property (readonly) BOOL backwardsAvailable;
 
@@ -39,4 +39,4 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 
-NS_ASSUME_NONNULL_END
\ No newline at end of file
+NS_ASSUME_NONNULL_END

modules/gui/macosx/library/VLCLibraryNavigationStack.m

@@ -72,6 +72,12 @@
     return self;
 }
 
+- (void)setDelegate:(VLCLibraryWindow *)delegate
+{
+    _delegate = delegate;
+    [self updateDelegateNavigationButtons];
+}
+
 - (BOOL)forwardsAvailable
 {
     NSUInteger numNavigationStates = _navigationStates.count;
@@ -157,4 +163,4 @@
     [self updateDelegateNavigationButtons];
 }
 
-@end
\ No newline at end of file
+@end

modules/gui/macosx/library/VLCLibraryNavigationState.m

@@ -39,4 +39,4 @@
     return navState;
 }
 
-@end
\ No newline at end of file
+@end

modules/gui/macosx/library/VLCLibraryWindow.m

@@ -995,8 +995,12 @@ static void addShadow(NSImageView *__unsafe_unretained imageView)
     [libraryWindow.gridVsListSegmentedControl setSelectedSegment:rememberedSelectedLibraryViewModeSegment];
     [libraryWindow.libraryAudioDataSource.segmentedControl setSelectedSegment:rememberedSelectedLibraryViewAudioSegment];
 
-    [libraryWindow segmentedControlAction:libraryWindow.navigationStack]; // Prevent actions being added to the nav stack
+    // We don't want to add these to the navigation stack...
     [libraryWindow.libraryAudioDataSource segmentedControlAction:libraryWindow.navigationStack];
+    [libraryWindow segmentedControlAction:libraryWindow.navigationStack];
+
+    // But we do want the "final" initial position to be added. So we manually invoke the navigation stack
+    [libraryWindow.navigationStack appendCurrentLibraryState];
 
     completionHandler(libraryWindow, nil);
 }