Fix conflicts

src/components/player/Player.tsx

@@ -644,7 +644,7 @@ const Player = ({ currentEntryList, muted, children }: any, ref: any) => {
       setMetadata(playQueue.current);
 
       // Save the queue 2.5 seconds after fade length
-      if (settings.getSync('resume')) {
+      if (settings.get('resume')) {
         setTimeout(() => {
           ipcRenderer.send('quicksave');
         }, playQueue.fadeDuration * 1000 + 2500);

src/components/settings/ConfigPanels/LookAndFeelConfig.tsx

@@ -298,13 +298,13 @@ export const ThemeConfigPanel = ({ bordered }: any) => {
     Boolean(settings.get('dynamicBackground'))
   );
   const [retainWindowSizeChk, setRetainWindowSizeChk] = useState(
-    Boolean(settings.getSync('retainWindowSize'))
+    Boolean(settings.get('retainWindowSize'))
   );
   const [defaultWindowHeight, setDefaultWindowHeightValue] = useState(
-    Number(settings.getSync('defaultWindowHeight'))
+    Number(settings.get('defaultWindowHeight'))
   );
   const [defaultWindowWidth, setDefaultWindowWidthValue] = useState(
-    Number(settings.getSync('defaultWindowWidth'))
+    Number(settings.get('defaultWindowWidth'))
   );
 
   const [selectedTheme, setSelectedTheme] = useState(String(settings.get('theme')));
@@ -508,7 +508,7 @@ export const ThemeConfigPanel = ({ bordered }: any) => {
             defaultChecked={retainWindowSizeChk}
             checked={retainWindowSizeChk}
             onChange={(e: boolean) => {
-              settings.setSync('retainWindowSize', e);
+              settings.set('retainWindowSize', e);
               dispatch(setRetainWindowSize(e));
               setRetainWindowSizeChk(e);
             }}
@@ -530,7 +530,7 @@ export const ThemeConfigPanel = ({ bordered }: any) => {
             max={7680}
             width={125}
             onChange={(e: number) => {
-              settings.setSync('defaultWindowWidth', Number(e));
+              settings.set('defaultWindowWidth', Number(e));
               dispatch(setDefaultWindowWidth(Number(e)));
               setDefaultWindowWidthValue(Number(e));
             }}
@@ -552,7 +552,7 @@ export const ThemeConfigPanel = ({ bordered }: any) => {
             max={7680}
             width={125}
             onChange={(e: number) => {
-              settings.setSync('defaultWindowHeight', Number(e));
+              settings.set('defaultWindowHeight', Number(e));
               dispatch(setDefaultWindowHeight(Number(e)));
               setDefaultWindowHeightValue(Number(e));
             }}

src/components/shared/setDefaultSettings.ts

@@ -1732,6 +1732,26 @@ export const setDefaultSettings = (force: boolean) => {
     settings.set('titleBarStyle', isMacOS() ? 'mac' : 'windows');
   }
 
+  if (force || !settings.has('retainWindowSize')) {
+    settings.set('retainWindowSize', false);
+  }
+
+  if (force || !settings.has('defaultWindowWidth')) {
+    settings.set('defaultWindowWidth', 1280);
+  }
+
+  if (force || !settings.has('defaultWindowHeight')) {
+    settings.set('defaultWindowHeight', 720);
+  }
+
+  if (force || !settings.has('savedWindowSize')) {
+    settings.set('savedWindowSize', [1280, 720]);
+  }
+
+  if (force || !settings.has('savedWindowPos')) {
+    settings.set('savedWindowPos', [50, 50]);
+  }
+
   if (force || !settings.has('musicListColumns')) {
     settings.set('musicListColumns', [
       {

src/main.dev.js

@@ -283,7 +283,7 @@ if (isWindows() && isWindows10()) {
 
   const Controls = windowsMediaPlayback.BackgroundMediaPlayer.current.systemMediaTransportControls;
 
-  if (settings.getSync('systemMediaTransportControls')) {
+  if (settings.get('systemMediaTransportControls')) {
     Controls.isEnabled = true;
   } else {
     Controls.isEnabled = false;
@@ -420,15 +420,12 @@ const createWindow = async () => {
   let isCentered = true;
 
   // If retained window size is enabled, use saved dimensions and position. Otherwise, use defined defaults
-  if (settings.getSync('retainWindowSize')) {
-    windowDimensions = settings.getSync('savedWindowSize');
-    windowPos = settings.getSync('savedWindowPos');
+  if (settings.get('retainWindowSize')) {
+    windowDimensions = settings.get('savedWindowSize');
+    windowPos = settings.get('savedWindowPos');
     isCentered = false;
   } else {
-    windowDimensions = [
-      settings.getSync('defaultWindowWidth'),
-      settings.getSync('defaultWindowHeight'),
-    ];
+    windowDimensions = [settings.get('defaultWindowWidth'), settings.get('defaultWindowHeight')];
   }
 
   mainWindow = new BrowserWindow({
@@ -560,8 +557,8 @@ const createWindow = async () => {
   });
 
   mainWindow.on('moved', () => {
-    if (settings.getSync('retainWindowSize')) {
-      settings.setSync('savedWindowPos', mainWindow.getPosition());
+    if (settings.get('retainWindowSize')) {
+      settings.set('savedWindowPos', mainWindow.getPosition());
     }
   });
 
@@ -573,9 +570,9 @@ const createWindow = async () => {
     }
 
     // If retain window size is enabled, save the dimensions
-    if (settings.getSync('retainWindowSize')) {
+    if (settings.get('retainWindowSize')) {
       const curSize = mainWindow.getSize();
-      settings.setSync('savedWindowSize', [curSize[0], curSize[1]]);
+      settings.set('savedWindowSize', [curSize[0], curSize[1]]);
     }
 
     // If we have enabled saving the queue, we need to defer closing the main window until it has finished saving.