fix read-receipt being sent onFocus on invalid conversation

5 years ago · b6c7c41402
parent 48d271578b
commit b6c7c41402
2 changed files with 6 additions and 2 deletions
--- a/app/tray_icon.js
+++ b/app/tray_icon.js
@ -65,7 +65,8 @@ function createTrayIcon(getMainWindow, messages) {
    trayContextMenu = Menu.buildFromTemplate([
      {
        id: 'toggleWindowVisibility',
-        label: messages[mainWindow.isVisible() ? 'appMenuHide' : 'show'].message,
+        label:
+          messages[mainWindow.isVisible() ? 'appMenuHide' : 'show'].message,
        click: tray.toggleWindowVisibility,
      },
      {
--- a/js/views/conversation_view.js
+++ b/js/views/conversation_view.js
@ -391,7 +391,10 @@
      this.window.addEventListener('resize', this.onResize);

      this.onFocus = () => {
-        if (this.$el.css('display') !== 'none') {
+        if (
+          this.$el.css('display') !== 'none' &&
+          this.$el.css('display') !== ''
+        ) {
          this.markRead();
        }
      };