modules/gui/macosx/library/VLCLibraryWindow.m

@@ -395,37 +395,41 @@ static void addShadow(NSImageView *__unsafe_unretained imageView)
 {
     // Only collection view mode
     [self.toolbarDelegate layoutForSegment:VLCLibraryHomeSegment];
-    VLCLibraryHomeViewController * const lvc =
-        [[VLCLibraryHomeViewController alloc] initWithLibraryWindow:self];
-    [lvc presentHomeView];
-    _librarySegmentViewController = lvc;
+    if (![self.librarySegmentViewController isKindOfClass:VLCLibraryHomeViewController.class]) {
+        _librarySegmentViewController =
+            [[VLCLibraryHomeViewController alloc] initWithLibraryWindow:self];
+    }
+    [(VLCLibraryHomeViewController *)self.librarySegmentViewController presentHomeView];
 }
 
 - (void)showVideoLibrary
 {
     [self.toolbarDelegate layoutForSegment:VLCLibraryVideoSegment];
-    VLCLibraryVideoViewController * const lvc =
-        [[VLCLibraryVideoViewController alloc] initWithLibraryWindow:self];
-    [lvc presentVideoView];
-    _librarySegmentViewController = lvc;
+    if (![self.librarySegmentViewController isKindOfClass:VLCLibraryVideoViewController.class]) {
+        _librarySegmentViewController =
+            [[VLCLibraryVideoViewController alloc] initWithLibraryWindow:self];
+    }
+    [(VLCLibraryVideoViewController *)self.librarySegmentViewController presentVideoView];
 }
 
 - (void)showShowLibrary
 {
     [self.toolbarDelegate layoutForSegment:VLCLibraryShowsVideoSubSegment];
-    VLCLibraryVideoViewController * const lvc =
-        [[VLCLibraryVideoViewController alloc] initWithLibraryWindow:self];
-    [lvc presentShowsView];
-    _librarySegmentViewController = lvc;
+    if (![self.librarySegmentViewController isKindOfClass:VLCLibraryVideoViewController.class]) {
+        _librarySegmentViewController =
+            [[VLCLibraryVideoViewController alloc] initWithLibraryWindow:self];
+    }
+    [(VLCLibraryVideoViewController *)self.librarySegmentViewController presentShowsView];
 }
 
 - (void)showAudioLibrary
 {
     [self.toolbarDelegate layoutForSegment:VLCLibraryMusicSegment];
-    VLCLibraryAudioViewController * const lvc =
-        [[VLCLibraryAudioViewController alloc] initWithLibraryWindow:self];
-    [lvc presentAudioView];
-    _librarySegmentViewController = lvc;
+    if (![self.librarySegmentViewController isKindOfClass:VLCLibraryAudioViewController.class]) {
+        _librarySegmentViewController =
+            [[VLCLibraryAudioViewController alloc] initWithLibraryWindow:self];
+    }
+    [(VLCLibraryAudioViewController *)self.librarySegmentViewController presentAudioView];
 }
 
 - (void)showPlaylistLibrary:(enum vlc_ml_playlist_type_t)playlistType
@@ -437,10 +441,12 @@ static void addShadow(NSImageView *__unsafe_unretained imageView)
     } else {
         [self.toolbarDelegate layoutForSegment:VLCLibraryPlaylistsSegment];
     }
-    VLCLibraryPlaylistViewController * const lvc =
-        [[VLCLibraryPlaylistViewController alloc] initWithLibraryWindow:self];
-    [lvc presentPlaylistsViewForPlaylistType:playlistType];
-    _librarySegmentViewController = lvc;
+
+    if (![self.librarySegmentViewController isKindOfClass:VLCLibraryPlaylistViewController.class]) {
+        _librarySegmentViewController =
+            [[VLCLibraryPlaylistViewController alloc] initWithLibraryWindow:self];
+    }
+    [(VLCLibraryPlaylistViewController *)self.librarySegmentViewController presentPlaylistsViewForPlaylistType:playlistType];
 }
 
 - (void)showMediaSourceLibrary
@@ -460,10 +466,11 @@ static void addShadow(NSImageView *__unsafe_unretained imageView)
 - (void)showGroupsLibrary
 {
     [self.toolbarDelegate layoutForSegment:VLCLibraryGroupsSegment];
-    VLCLibraryGroupsViewController * const lvc =
-        [[VLCLibraryGroupsViewController alloc] initWithLibraryWindow:self];
-    [lvc presentGroupsView];
-    _librarySegmentViewController = lvc;
+    if (![self.librarySegmentViewController isKindOfClass:VLCLibraryGroupsViewController.class]) {
+        _librarySegmentViewController =
+            [[VLCLibraryGroupsViewController alloc] initWithLibraryWindow:self];
+    }
+    [(VLCLibraryGroupsViewController *)self.librarySegmentViewController presentGroupsView];
 }
 
 - (void)displayLibraryView:(NSView *)view
@@ -534,7 +541,7 @@ static void addShadow(NSImageView *__unsafe_unretained imageView)
 - (void)presentGroupLibraryItem:(id<VLCMediaLibraryItemProtocol>)libraryItem
 {
     [self showGroupsLibrary];
-    [(VLCLibraryAudioViewController *)self.librarySegmentViewController presentLibraryItem:libraryItem];
+    [(VLCLibraryGroupsViewController *)self.librarySegmentViewController presentGroup:libraryItem];
 }
 
 - (void)presentLibraryItem:(id<VLCMediaLibraryItemProtocol>)libraryItem

modules/gui/macosx/library/audio-library/VLCLibraryAudioViewController.m

@@ -512,7 +512,6 @@ NSString *VLCLibraryPlaceholderAudioViewIdentifier = @"VLCLibraryPlaceholderAudi
     VLCLibraryWindow * const libraryWindow = self.libraryWindow;
     libraryWindow.librarySegmentType = segmentType;
     [libraryWindow.splitViewController.navSidebarViewController selectSegment:segmentType];
-    [self updatePresentedView];
 }
 
 - (void)libraryModelUpdated:(NSNotification *)aNotification