vcl/source/app/scheduler.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit c65da08f5fbe793acee70930cfdd2837e89d847a
Author:     Tor Lillqvist <[email protected]>
AuthorDate: Wed Nov 5 11:47:22 2025 +0200
Commit:     Tor Lillqvist <[email protected]>
CommitDate: Sat Jan 17 20:59:50 2026 +0100

    Don't fail assertion in Task::~Task() if LibreOfficeKit is active
    
    Apps using LibreOfficeKit often have unusual lifecycles.
    
    Change-Id: Ie113d7458cff10beba2e44181d0b6ce5758a7634
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197504
    Tested-by: Jenkins
    Reviewed-by: Tor Lillqvist <[email protected]>

diff --git a/vcl/source/app/scheduler.cxx b/vcl/source/app/scheduler.cxx
index 31f53de9ddfa..cf7078e096d9 100644
--- a/vcl/source/app/scheduler.cxx
+++ b/vcl/source/app/scheduler.cxx
@@ -41,6 +41,7 @@
 #include <salinst.hxx>
 #include <comphelper/emscriptenthreading.hxx>
 #include <comphelper/profilezone.hxx>
+#include <comphelper/lok.hxx>
 #include <schedulerimpl.hxx>
 
 namespace {
@@ -796,7 +797,7 @@ Task::~Task()
             mpSchedulerData->mpTask = nullptr;
     }
     else
-        assert(nullptr == mpSchedulerData || comphelper::IsFuzzing());
+        assert(nullptr == mpSchedulerData || comphelper::IsFuzzing() || 
comphelper::LibreOfficeKit::isActive());
 }
 
 bool Task::DecideTransferredExecution()

Reply via email to