#790: since we handle "iconified" state separately via a timer, make …

…sure we don't also store it in the "_window_state" which may get sent to the server with other window events git-svn-id: https://xpra.org/svn/Xpra/trunk@16722 3bb7dfac-3a0b-4e04-842a-767bc560f471
Xpra-org · Aug 28, 2017 · 418b6cc · 418b6cc
1 parent 6603311
commit 418b6cc
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/src/xpra/client/gtk_base/gtk_client_window_base.py b/src/xpra/client/gtk_base/gtk_client_window_base.py
@@ -478,11 +478,12 @@ def update_window_state(self, state_updates):
                 actual_updates[state] = value
                 statelog("%s=%s (was %s)", var, value, cur)
         server_updates = dict((k,v) for k,v in actual_updates.items() if k in self._client.server_window_states)
-        statelog("window_state_updated(..) state updates: %s, actual updates: %s, server updates: %s", state_updates, actual_updates, server_updates)
-        self._window_state.update(server_updates)
         #iconification is handled a bit differently...
-        iconified = server_updates.get("iconified")
-        if iconified is not None:
+        try:
+            iconified = server_updates.pop("iconified")
+        except:
+            iconified = None
+        else:
             statelog("iconified=%s", iconified)
             #handle iconification as map events:
             if iconified:
@@ -506,6 +507,8 @@ def tell_server():
             else:
                 self._frozen = False
                 self.process_map_event()
+        statelog("window_state_updated(..) state updates: %s, actual updates: %s, server updates: %s", state_updates, actual_updates, server_updates)
+        self._window_state.update(server_updates)
         self.emit("state-updated")
         #if we have state updates, send them back to the server using a configure window packet:
         def send_updated_window_state():