From e49b349d6cf20948ae745b09fce9a2e2db27c246 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Tue, 14 Nov 2017 09:19:08 +0100
Subject: [PATCH] add a check at getting event types, if the activity is still
 alive

---
 app/build.gradle                                         | 2 +-
 .../simplemobiletools/calendar/activities/DayActivity.kt | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 8ad8112ae..ed141638c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -47,7 +47,7 @@ ext {
 }
 
 dependencies {
-    compile 'com.simplemobiletools:commons:2.39.4'
+    compile 'com.simplemobiletools:commons:2.39.5'
     compile 'joda-time:joda-time:2.9.9'
     compile 'com.facebook.stetho:stetho:1.5.0'
     compile 'com.bignerdranch.android:recyclerview-multiselect:0.2'
diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/DayActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/DayActivity.kt
index 079e54700..8676a819e 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/DayActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/DayActivity.kt
@@ -16,6 +16,7 @@ import com.simplemobiletools.calendar.helpers.DAY_CODE
 import com.simplemobiletools.calendar.helpers.Formatter
 import com.simplemobiletools.calendar.helpers.NEW_EVENT_START_TS
 import com.simplemobiletools.calendar.interfaces.NavigationListener
+import com.simplemobiletools.commons.extensions.isActivityDestroyed
 import com.simplemobiletools.commons.extensions.updateTextColors
 import kotlinx.android.synthetic.main.activity_day.*
 import org.joda.time.DateTime
@@ -43,9 +44,11 @@ class DayActivity : SimpleActivity(), NavigationListener, ViewPager.OnPageChange
         updateTextColors(day_coordinator)
 
         dbHelper.getEventTypes {
-            eventTypeColors.clear()
-            it.map { eventTypeColors.put(it.id, it.color) }
-            invalidateOptionsMenu()
+            if (!isActivityDestroyed()) {
+                eventTypeColors.clear()
+                it.map { eventTypeColors.put(it.id, it.color) }
+                invalidateOptionsMenu()
+            }
         }
     }