mirror of
https://github.com/gedoor/legado.git
synced 2025-08-10 00:52:30 +00:00
现在超时不会触发取消任务了,onFinal会正常触发,取消任务的时候不触发onFinal,防止服务退出后仍然执行onFinal
This commit is contained in:
@@ -148,7 +148,7 @@ class Coroutine<T>(
|
||||
success?.let { dispatchCallback(this, value, it) }
|
||||
} catch (e: Throwable) {
|
||||
e.printOnDebug()
|
||||
if (e is CancellationException && !isActive && e !is ActivelyCancelException) {
|
||||
if (e is CancellationException && e !is ActivelyCancelException && isCancelled) {
|
||||
this@Coroutine.cancel()
|
||||
}
|
||||
val consume: Boolean = errorReturn?.value?.let { value ->
|
||||
@@ -159,9 +159,7 @@ class Coroutine<T>(
|
||||
error?.let { dispatchCallback(this, e, it) }
|
||||
}
|
||||
} finally {
|
||||
withContext(NonCancellable) {
|
||||
finally?.let { dispatchVoidCallback(this, it) }
|
||||
}
|
||||
finally?.let { dispatchVoidCallback(this, it) }
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user