Skip to content

Commit d30b015

Browse files
committed
fix: Task가 취소되지 않았을 경우 로딩을 끝내버릴 수 있는 이슈 해결
1 parent 62b618b commit d30b015

2 files changed

Lines changed: 6 additions & 2 deletions

File tree

DevLog/Presentation/ViewModel/SearchViewModel.swift

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,9 @@ final class SearchViewModel: Store {
139139
do {
140140
defer {
141141
self.searchTasks[.request] = nil
142-
self.endLoading(.immediate)
142+
if !Task.isCancelled {
143+
self.endLoading(.immediate)
144+
}
143145
}
144146
let searchesTodoOnly = searchesTodoOnly(query)
145147
async let todos = fetchTodosUseCase.execute(TodoQuery(keyword: query), cursor: nil)

DevLog/Presentation/ViewModel/TodoListViewModel.swift

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,9 @@ final class TodoListViewModel: Store {
180180
do {
181181
defer {
182182
self.searchTasks[.request] = nil
183-
self.endLoading(.immediate)
183+
if !Task.isCancelled {
184+
self.endLoading(.immediate)
185+
}
184186
}
185187
let query = TodoQuery(category: state.category, keyword: keyword)
186188
let page = try await fetchTodosUseCase.execute(query, cursor: nil)

0 commit comments

Comments
 (0)