From 74bad86981a17bed12510707368ab5602c4a0a3d Mon Sep 17 00:00:00 2001
From: Thomas Goyne <plorkyeran@aegisub.org>
Date: Sun, 24 Aug 2014 07:42:56 -0700
Subject: [PATCH] Handle json parsing errors when loading shift times history

Closes #1802.
---
 src/dialog_shift_times.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/dialog_shift_times.cpp b/src/dialog_shift_times.cpp
index ae0bf242a..dc4f183de 100644
--- a/src/dialog_shift_times.cpp
+++ b/src/dialog_shift_times.cpp
@@ -344,6 +344,9 @@ void DialogShiftTimes::LoadHistory() {
 	catch (agi::fs::FileSystemError const& e) {
 		LOG_D("dialog_shift_times/load_history") << "Cannot load shift times history: " << e.GetMessage();
 	}
+	catch (json::Exception const& e) {
+		LOG_D("dialog_shift_times/load_history") << "Cannot load shift times history: " << e.what();
+	}
 	catch (...) {
 		history_box->Thaw();
 		throw;