When forkit installs fonts, sparekits that already exist don't get them

at least the first spare kit created by forkit_main will exist without the fonts which arrive later Signed-off-by: Caolán McNamara <[email protected]> Change-Id: Idd778a40791266b0e2ff7ec6ba02dca6a19d0f23
GringoSW · Nov 5, 2024 · 0ebe822 · 0ebe822
1 parent e3c051b
commit 0ebe822
Showing 1 changed file with 15 additions and 0 deletions.
diff --git a/wsd/COOLWSD.cpp b/wsd/COOLWSD.cpp
@@ -1195,6 +1195,14 @@ class RemoteJSONPoll : public SocketPoll
     std::string _expectedKind;
 };
 
+static void requestTerminateSpareKits()
+{
+    std::unique_lock<std::mutex> lock(NewChildrenMutex);
+    const int count = NewChildren.size();
+    for (int i = count - 1; i >= 0; --i)
+        NewChildren[i]->requestTermination();
+}
+
 class RemoteConfigPoll : public RemoteJSONPoll
 {
 public:
@@ -1873,6 +1881,13 @@ class RemoteFontConfigPoll : public RemoteJSONPoll
 
         COOLWSD::sendMessageToForKit("addfont " + fontFile);
 
+        // Request existing spare kits to quit, to get replaced with ones that
+        // include the new fonts.
+        if (PrisonerPoll)
+        {
+            PrisonerPoll->addCallback([]{ requestTerminateSpareKits(); });
+        }
+
         return true;
     }