From 7f7bbcb80b860e822818b36553540e18245d14cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mr=C2=B7x?= <as2252258@163.com>
Date: Fri, 18 Sep 2020 17:27:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Database/Pagination.php | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/Database/Pagination.php b/Database/Pagination.php
index d7491541..dee69e17 100644
--- a/Database/Pagination.php
+++ b/Database/Pagination.php
@@ -179,18 +179,16 @@ class Pagination extends Component
 	private function executed($callback, $data, $param)
 	{
 		$this->_group->add(1);
-		return Coroutine::create(function ($callback, $data, $param) {
+		return Coroutine::create(function ($callback, $data, $param): void {
+			Coroutine::defer([$this, 'done']);
 			try {
 				call_user_func($callback, $data, $param);
 			} catch (\Throwable $exception) {
 				$this->addError($exception->getMessage());
 			} finally {
-				$this->_group->done();
 				$event = Snowflake::app()->getEvent();
-				if (!$event->exists(Event::EVENT_AFTER_REQUEST)) {
-					return;
-				}
 				$event->trigger(Event::EVENT_AFTER_REQUEST);
+				$this->_group->done();
 			}
 		}, $callback, $data, $param);
 	}