Merge pull request #143 from codecentric/bugfix-number-of-merge-requests

Bugfix number of merge requests

Author: Matthias Rütten

package.json

@@ -1,6 +1,6 @@
 {
   "name": "merge-request-notifier",
-  "version": "1.8.1",
+  "version": "1.8.2",
   "description": "This app shows your merge requests grouped by projects and WIP status. It is accessible from the system tray.",
   "main": "./dist/main/main.js",
   "homepage": "https://github.com/codecentric/merge-request-notifier",

src/main/main.ts

@@ -189,7 +189,10 @@ const getGeneralConfig = (): GeneralConfig => {
     const savedConfig: Config = electronSettings.get('config.v3') as any
 
     if (savedConfig) {
-        return savedConfig.generalConfig
+        return {
+            ...DEFAULT_CONFIG.generalConfig,
+            ...savedConfig.generalConfig,
+        }
     }
 
     return DEFAULT_CONFIG.generalConfig
@@ -278,10 +281,7 @@ app.on('activate', async () => {
 
 ipcMain.on('update-open-merge-requests', (_: any, openMergeRequests: number) => {
     if (tray) {
-        const { showOpenMergeRequestsInTrayIcon } = getGeneralConfig()
-        if (showOpenMergeRequestsInTrayIcon) {
-            tray.setImage(getTrayImage(openMergeRequests))
-        }
+        tray.setImage(getTrayImage(openMergeRequests))
     }
 })
 

src/share/config.ts

@@ -21,7 +21,6 @@ export interface GeneralConfig {
     trayIconForDarkMode: 'system' | 'darkMode' | 'lightMode'
     startOnLogin: boolean
     openShortcut: string
-    showOpenMergeRequestsInTrayIcon: boolean
 }
 
 export const DEFAULT_CONFIG: Config = {
@@ -32,6 +31,5 @@ export const DEFAULT_CONFIG: Config = {
         darkMode: false,
         startOnLogin: true,
         openShortcut: 'CmdOrCtrl+Shift+m',
-        showOpenMergeRequestsInTrayIcon: true,
     },
 }