From 5308c6f8ce0f33cc207eec93ddd850705c720ca6 Mon Sep 17 00:00:00 2001
From: Warinyourself <warinyourself@gmail.com>
Date: Fri, 9 Dec 2022 17:32:40 +0300
Subject: [PATCH] Fix conflicts

---
 acpi.ts                                                    | 1 -
 src/App.tsx                                                | 2 +-
 src/components/base/settings/general/SettingsSelectors.tsx | 3 +--
 src/store/app.ts                                           | 2 +-
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/acpi.ts b/acpi.ts
index 8a6105b..b6bd922 100644
--- a/acpi.ts
+++ b/acpi.ts
@@ -54,7 +54,6 @@ class ACPIController {
     acpi.stdout.addListener('data', (d: Buffer) => {
       const data = d.toString().trim()
       this.callbacks.forEach((cb) => {
-        console.log({ data })
         if (cb !== undefined) cb(data)
       })
     })
diff --git a/src/App.tsx b/src/App.tsx
index 3b6ab41..b8b682a 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -26,7 +26,7 @@ export default class MainApp extends Vue {
    * INFO: For High-DPI screens settings
    */
   initZoom() {
-    setCSSVariable('--zoom', AppModule.zoom + '')
+    setCSSVariable('--zoom', AppModule.zoom + '' || '1')
   }
 
   created() {
diff --git a/src/components/base/settings/general/SettingsSelectors.tsx b/src/components/base/settings/general/SettingsSelectors.tsx
index 65e4875..015514e 100644
--- a/src/components/base/settings/general/SettingsSelectors.tsx
+++ b/src/components/base/settings/general/SettingsSelectors.tsx
@@ -87,8 +87,7 @@ export default class SettingsSelectors extends Vue {
 
   @Debounce(100)
   updateZoom(value: AppInputThemeValue) {
-    setCSSVariable('--zoom', value + '')
-    console.log({ value })
+    setCSSVariable('--zoom', value + '' || '1')
     AppModule.SET_STATE_APP({ key: 'zoom', value: parseFloat(value + '') })
   }
 
diff --git a/src/store/app.ts b/src/store/app.ts
index 4c077e5..ceb9355 100644
--- a/src/store/app.ts
+++ b/src/store/app.ts
@@ -350,7 +350,7 @@ class App extends VuexModule implements AppState {
       this.SET_STATE_APP({ key: 'currentOs', value: settings.currentOs || 'arch-linux' })
       this.SET_STATE_APP({ key: 'desktop', value: settings.desktop })
       this.SET_STATE_APP({ key: 'username', value: settings.username })
-      this.SET_STATE_APP({ key: 'zoom', value: settings.zoom })
+      this.SET_STATE_APP({ key: 'zoom', value: settings.zoom || 1 })
     } catch (error) {
       this.setUpSettings()
     }