afl-eventtesting: quit on next cycle if testing stops early

Change-Id: Ie313009ee0d10872f5e705d017e6a73ff83c2761

1 files changed, 4 insertions, 5 deletions

diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index d4b197b0d8ac..2c017443da6f 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -351,12 +351,14 @@ namespace
 
     void CloseDialogsAndQuit()
     {
+        Scheduler::ProcessTaskScheduling(true);
         vcl::Window* pAppWindow = Application::GetFirstTopLevelWindow();
         while (pAppWindow)
         {
             Dialog::EndAllDialogs(pAppWindow);
             pAppWindow = Application::GetNextTopLevelWindow(pAppWindow);
         }
+        Scheduler::ProcessTaskScheduling(true);
         Application::Quit();
     }
 }
@@ -378,11 +380,8 @@ IMPL_LINK_NOARG_TYPED(ImplSVAppData, VclEventTestingHdl, Idle *, void)
             --mnEventTestLimit;
         if (!mpEventTestInput->good())
         {
-            delete mpEventTestInput;
-            delete mpEventTestingIdle;
-            SAL_INFO("vcl.eventtesting", "Event Input exhausted, exiting" << mnEventTestLimit);
-            CloseDialogsAndQuit();
-            return;
+            SAL_INFO("vcl.eventtesting", "Event Input exhausted, exit next cycle");
+            mnEventTestLimit = 0;
         }
         Scheduler::ProcessTaskScheduling(true);
         mpEventTestingIdle->Start();