Merge branch 'master' into add-ua-locale

src/renderer/components/modal/modal-types/link-contents-modal.component.tsx

@@ -17,7 +17,7 @@ import { PlaylistsManagerService } from "renderer/services/playlists-manager.ser
 import { MapsManagerService } from "renderer/services/maps-manager.service";
 import { map } from "rxjs";
 
-export const LinkContentModal: ModalComponent<boolean, {version: BSVersion, contentType: "maps"|"playlists"|"avatars"|"sabers"|"platforms"|"blocks"}> = ({options: { data: { version, contentType } }, resolver }) => {
+export const LinkContentModal: ModalComponent<void, {version: BSVersion, contentType: "maps"|"playlists"|"avatars"|"sabers"|"platforms"|"blocks"}> = ({options: { data: { version, contentType } }, resolver }) => {
     const { text: t, element: te } = useTranslationV2();
 
     const versionLinker = useService(VersionFolderLinkerService);

src/renderer/services/models-management/models-manager.service.ts

@@ -81,7 +81,7 @@ export class ModelsManagerService {
         return this.versionFolderLinked.linkVersionFolder({
             version,
             relativeFolder: MODEL_TYPE_FOLDERS[type],
-            options: { keepContents: res.data !== false },
+            options: { keepContents: true },
         });
     }
 

src/renderer/services/playlists-manager.service.ts

@@ -132,7 +132,7 @@ export class PlaylistsManagerService {
         return this.linker.linkVersionFolder({
             version,
             relativeFolder: PlaylistsManagerService.RELATIVE_PLAYLISTS_FOLDER,
-            options: { keepContents: !!modalRes.data },
+            options: { keepContents: true },
         });
     }