LOK: Window creation supersedes any events on same window

This happens when we get multiple created events on
same window, interspersed with invalidations.

Change-Id: I2dbaa0f84306d770f1de047a23996209c28304fe

1 files changed, 13 insertions, 0 deletions

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 0c4b3f7237de..de22b316b6f7 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -1390,6 +1390,19 @@ void CallbackFlushHandler::queue(const int type, const char* data)
                         assert(aCallbackData.validate() && "Validation after setJson failed!");
                     }
                 }
+                else if (aTree.get<std::string>("action", "") == "created")
+                {
+                    // Remove all previous actions on same dialog, if we are creating it anew.
+                    removeAll([&nLOKWindowId](const queue_type::value_type& elem) {
+                        if (elem.Type == LOK_CALLBACK_WINDOW)
+                        {
+                            const boost::property_tree::ptree& aOldTree = elem.getJson();
+                            if (nLOKWindowId == aOldTree.get<unsigned>("id", 0))
+                                return true;
+                        }
+                        return false;
+                    });
+                }
             }
             break;
         }