Fix undefined window state bug

package.json

@@ -2,7 +2,7 @@
   "name": "twenty",
   "productName": "Twenty",
   "description": "A customizable timer that reminds you to take breaks in preventing eye strain",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "repository": "https://github.com/jalenng/twenty",
   "url": "https://github.com/jalenng/twenty#readme",
   "author": {

public/electron.js

@@ -44,7 +44,6 @@ app.setLoginItemSettings({
 let appTray = null
 
 app.whenReady().then(() => {
-
   /* Create main window */
   global.mainWindow = createWindow('main')
 

public/systems/EventEmitter.js

@@ -22,7 +22,10 @@ class EventEmitter {
    * @param {(callback) => any} fireCallbacks
    */
   emit (eventName, fireCallbacks = callback => callback()) {
-    this._events[eventName].forEach(fireCallbacks)
+    const callbacks = this._events[eventName]
+    if (callbacks) {
+      callbacks.forEach(fireCallbacks)
+    }
   }
 }
 

public/systems/systemsInitializer.js

@@ -18,13 +18,6 @@ global.notificationSystem = new NotificationSystem()
 global.appSnapshotSystem = new AppSnapshotSystem()
 global.blockerSystem = new BlockerSystem()
 
-/* ------------------------------------------------------------------------- */
-/* Start timer automatically based on user preferences */
-
-if (global.store.get('preferences.startup.startTimerOnAppStartup')) { global.timerSystem.start() }
-
-global.appSnapshotSystem.updateState()
-
 /* ------------------------------------------------------------------------- */
 /* If timer has stopped and the notification interval updates, update the timer with the new value. */
 
@@ -94,3 +87,12 @@ powerMonitor.on('on-ac', () => {
     global.blockerSystem.remove('other', 'batteryPower')
   }
 })
+
+/* ------------------------------------------------------------------------- */
+/* Start timer automatically based on user preferences */
+
+if (global.store.get('preferences.startup.startTimerOnAppStartup')) {
+  global.timerSystem.start()
+}
+
+global.appSnapshotSystem.updateState()

public/systems/timerSystem.js

@@ -76,9 +76,19 @@ class TimerSystem extends EventEmitter {
    */
   getState () {
     if (this.isStopped) {
-      if (this.isBlocked) { return states.BLOCKED_AND_STOPPED } else { return states.STOPPED }
+      if (this.isBlocked) {
+        return states.BLOCKED_AND_STOPPED
+      } else {
+        return states.STOPPED
+      }
     } else {
-      if (this.isBlocked) { return states.BLOCKED } else if (this.isIdle) { return states.IDLE } else { return states.RUNNING }
+      if (this.isBlocked) {
+        return states.BLOCKED
+      } else if (this.isIdle) {
+        return states.IDLE
+      } else {
+        return states.RUNNING
+      }
     }
   }
 

public/windowCreator.js

@@ -94,7 +94,9 @@ function createWindow (type, destination = '', display = null, isPopup = false)
       mainWindowState = windowStateKeeper({})
 
       // Update and remember the position of the main window
-      window.setPosition(mainWindowState.x, mainWindowState.y)
+      if (mainWindowState.x && mainWindowState.y) {
+        window.setPosition(mainWindowState.x, mainWindowState.y)
+      }
       mainWindowState.manage(window)
 
       // Make the main window always on top if its corresponding preference is enabled