From d231f2f785d9c1b3054bbffe89e2e01df7de2725 Mon Sep 17 00:00:00 2001
From: Dpeta <jasprose@protonmail.com>
Date: Sat, 18 Sep 2021 12:39:38 +0200
Subject: [PATCH] Fixed PESTERCHUM:TIME> related crash

---
 CHANGELOG.md |  6 ++++++
 memos.py     | 18 +++++++++++-------
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 56d06ec..17cfb53 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,12 @@
 # Changelog
 (This document uses YYYY-MM-DD)
 
+## [v2.1.3.1] - 2021-9-18
+
+### Fixed
+ - Crash for certain invalid values of PESTERCHUM:TIME>
+
+
 ## [v2.1.3.1] - 2021-8-24
 
 ### Added
diff --git a/memos.py b/memos.py
index 8863b78..9261c59 100644
--- a/memos.py
+++ b/memos.py
@@ -1021,14 +1021,18 @@ class PesterMemo(PesterConvo):
             s = (timed.seconds // 60)*60
             timed = timedelta(timed.days, s)
         except ValueError:
-            if cmd == "i":
-                timed = timedelta(0)
-            else:
-                if cmd[len(cmd)-1] == 'c':
-                    close = timeProtocol(cmd)
-                    timed = None
+            try:
+                if cmd == "i":
+                    timed = timedelta(0)
                 else:
-                    timed = timeProtocol(cmd)
+                    if cmd[len(cmd)-1] == 'c':
+                        close = timeProtocol(cmd)
+                        timed = None
+                    else:
+                        timed = timeProtocol(cmd)
+            except:
+                PchumLog.warning("Invalid PESTERCHUM:TIME> " + str(cmd))
+                timed = timedelta(0)
 
         if handle in self.times:
             if close is not None: