summaryrefslogtreecommitdiff
path: root/app/models
diff options
context:
space:
mode:
authorDavid Gay <david@davidgay.org>2021-06-09 21:27:36 -0400
committerDavid Gay <david@davidgay.org>2021-06-09 21:27:36 -0400
commit6fbb3db6f1dda597cc997fa07ab6545ef99f717d (patch)
tree72a266f1157889a461340d788cdbdab3d325d476 /app/models
parenta068f2a59cd7070ec7a59b32908bde5ede4a1fb7 (diff)
Extra guards to prevent running activity duration check code when important related values are nil (hopefully fixes #3 and fixes #2)
Diffstat (limited to 'app/models')
-rw-r--r--app/models/character.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/character.rb b/app/models/character.rb
index ce2b0db..d386002 100644
--- a/app/models/character.rb
+++ b/app/models/character.rb
@@ -197,6 +197,7 @@ class Character < ApplicationRecord
end
def activity_time_remaining
+ return nil unless self.activity
time = activity_duration - (Time.now - self.activity_started_at)
time -= rested_duration_to_spend_on_activity if self.rested_duration > 0
time