From 80aeb42c2826ba9d3e8b5cfb74623742ff1862f1 Mon Sep 17 00:00:00 2001 From: Laurent Date: Mon, 8 Apr 2019 11:06:40 +0200 Subject: [PATCH] Fixes crash occuring when restarting a finished session --- .../net/pokeranalytics/android/model/realm/Session.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt index a878d185..2dce8655 100644 --- a/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt +++ b/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt @@ -321,8 +321,8 @@ open class Session : RealmObject(), Savable, Editable, StaticRowRepresentableDat val computableResult = realm.createObject(ComputableResult::class.java) computableResult.session = this } // if a ComputableResult exists and the session is not completed, delete it - else if (this.startDate == null || this.endDate == null) { - this.computableResult?.deleteFromRealm() + else if ((this.startDate == null || this.endDate == null) && this.computableResult != null && this.computableResult.isValid) { + this.computableResult.deleteFromRealm() } // Update the ComputableResult @@ -441,9 +441,9 @@ open class Session : RealmObject(), Savable, Editable, StaticRowRepresentableDat */ fun restart() { realm.executeTransaction { -// this.timeFrame?.paused = false this.pauseDate = null - this.startDate = Date() // timeFrame?.setDate(Date(), null) + this.startDate = Date() + this.endDate = null this.breakDuration = 0L } }