From e71eb3329e91dc5e6d386ce6f4994c835928faf4 Mon Sep 17 00:00:00 2001
From: Ximi1970 <ximi.github@gmail.com>
Date: Tue, 21 Apr 2020 21:38:44 +0200
Subject: [PATCH] Fix minimizing

---
 app/SysTray-X/windowctrl-unix.cpp |  2 ++
 app/SysTray-X/windowctrl.cpp      |  1 +
 webext/background.js              | 19 +++++++++++++++----
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/app/SysTray-X/windowctrl-unix.cpp b/app/SysTray-X/windowctrl-unix.cpp
index 4b3fdb2..03b8085 100644
--- a/app/SysTray-X/windowctrl-unix.cpp
+++ b/app/SysTray-X/windowctrl-unix.cpp
@@ -416,6 +416,8 @@ void    WindowCtrlUnix::hideWindowEvent( quint64 window, bool set )
                     _NET_WM_STATE_REMOVE,
                     static_cast<long>( XInternAtom( m_display, "_NET_WM_STATE_SKIP_TASKBAR", False ) ) );
     }
+
+    XFlush( m_display );
 }
 
 
diff --git a/app/SysTray-X/windowctrl.cpp b/app/SysTray-X/windowctrl.cpp
index 91ac256..a921f7f 100644
--- a/app/SysTray-X/windowctrl.cpp
+++ b/app/SysTray-X/windowctrl.cpp
@@ -35,6 +35,7 @@ WindowCtrl::WindowCtrl( Preferences* pref, QObject *parent )
     /*
      *  Initialize
      */
+    m_state = QString();
     setMinimizeType( m_pref->getMinimizeType() );
 
     /*
diff --git a/webext/background.js b/webext/background.js
index aba7cfc..1e4403f 100644
--- a/webext/background.js
+++ b/webext/background.js
@@ -1,6 +1,8 @@
 var SysTrayX = {
   debugAccounts: false,
 
+  startupState: undefined,
+
   pollTiming: {
     pollStartupDelay: "60",
     pollInterval: "60",
@@ -192,6 +194,14 @@ SysTrayX.Messaging = {
         numberColor: numberColor,
       },
     });
+
+    if (SysTrayX.startupState) {
+      //  Send startup state after the prefs
+      //  so the hide is handled conform the prefs
+      SysTrayX.Link.postSysTrayXMessage({ window: SysTrayX.startupState });
+
+      SysTrayX.startupState = undefined;
+    }
   },
 
   onSendIconStorageError: function (error) {
@@ -375,6 +385,10 @@ async function start() {
     });
   }
 
+  SysTrayX.startupState = state;
+
+  console.debug("State: "+ SysTrayX.startupState);
+
   // Get the poll timing
   SysTrayX.pollTiming = await getPollTiming();
 
@@ -382,7 +396,7 @@ async function start() {
   SysTrayX.platformInfo = await browser.runtime
     .getPlatformInfo()
     .then((info) => info);
-    
+
   console.log("OS: " + SysTrayX.platformInfo.os);
   console.log("Arch: " + SysTrayX.platformInfo.arch);
   console.log("Nack-Arch: " + SysTrayX.platformInfo.nacl_arch);
@@ -406,9 +420,6 @@ async function start() {
   //  Setup the link first
   SysTrayX.Link.init();
 
-  //  Send current state
-  SysTrayX.Link.postSysTrayXMessage({ window: state });
-
   //  Main start
   SysTrayX.Messaging.init();
 }