fix(coro): fix awaitable/task move assignment, again

brainboxdotcc · Jul 15, 2024 · 6f06990 · 6f06990
1 parent 1899e6a
commit 6f06990
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/include/dpp/coro/awaitable.h b/include/dpp/coro/awaitable.h
@@ -322,6 +322,7 @@ class awaitable : public basic_awaitable<awaitable<T>> {
 	 * @return *this
 	 */
 	awaitable& operator=(awaitable&& rhs) noexcept {
+		abandon();
 		state_ptr = std::exchange(rhs.state_ptr, nullptr);
 		return *this;
 	}

diff --git a/include/dpp/coro/task.h b/include/dpp/coro/task.h
@@ -149,9 +149,9 @@ class [[nodiscard("dpp::task cancels itself on destruction. use co_await on it,
 	 * @param other Task to move the handle from
 	 */
 	task &operator=(task &&other) noexcept {
-		awaitable<R>::operator=(std::move(other));
 		cleanup();
 		handle = std::exchange(other.handle, nullptr);
+		awaitable<R>::operator=(std::move(other));
 		return *this;
 	}