From 0c36ed2a750408e029e8e15630644e86f7f87751 Mon Sep 17 00:00:00 2001
From: Jean-Luc Makiola <business@jeanlucmakiola.de>
Date: Sun, 27 Sep 2026 12:08:59 +0200
Subject: [PATCH] Spring the view back even though the gesture job is cancelled
 (#185)

---
 .../main/java/de/jeanlucmakiola/calendula/ui/CalendarHost.kt  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/de/jeanlucmakiola/calendula/ui/CalendarHost.kt b/app/src/main/java/de/jeanlucmakiola/calendula/ui/CalendarHost.kt
index 1fd1c4f4..284c58df 100644
--- a/app/src/main/java/de/jeanlucmakiola/calendula/ui/CalendarHost.kt
+++ b/app/src/main/java/de/jeanlucmakiola/calendula/ui/CalendarHost.kt
@@ -56,6 +56,8 @@ import de.jeanlucmakiola.calendula.ui.search.SearchScreen
 import de.jeanlucmakiola.calendula.ui.settings.SettingsScreen
 import de.jeanlucmakiola.calendula.ui.week.MultiDayScreen
 import de.jeanlucmakiola.calendula.ui.week.WeekScreen
+import kotlinx.coroutines.NonCancellable
+import kotlinx.coroutines.withContext
 import kotlinx.datetime.LocalDate
 import kotlinx.datetime.TimeZone
 import kotlinx.datetime.toLocalDateTime
@@ -378,7 +380,7 @@ fun CalendarHost(
                 events.collect { viewTransition.seekTo(it.progress, targetState = previous) }
                 viewStack = viewStack.dropLast(1)
             } catch (e: CancellationException) {
-                viewTransition.animateTo(viewTransition.currentState)
+                withContext(NonCancellable) { viewTransition.animateTo(viewTransition.currentState) }
                 throw e
             }
         }