From 4b192c07733eac9be3404304cae3cf0c17374cec Mon Sep 17 00:00:00 2001 From: Lars Henriksen Date: Wed, 5 Sep 2018 08:46:16 +0200 Subject: Error return code for io_reload_data() The return code from new_data() and io_load_data() is explicitly defined as a bit mask. A file access error is recognised and reported back to the user. Signed-off-by: Lars Henriksen Signed-off-by: Lukas Fleischer --- src/calcurse.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/calcurse.c') diff --git a/src/calcurse.c b/src/calcurse.c index 31be357..16d979f 100644 --- a/src/calcurse.c +++ b/src/calcurse.c @@ -309,7 +309,9 @@ static inline void key_generic_reload(void) int ret; ret = io_reload_data(); - if (ret != IO_RELOAD_CANCEL && ret != IO_RELOAD_NOOP) { + if (ret == IO_RELOAD_LOAD || + ret == IO_RELOAD_CTINUE || + ret == IO_RELOAD_MERGE) { ui_todo_load_items(); ui_todo_sel_reset(); do_storage(0); @@ -331,6 +333,8 @@ static inline void key_generic_reload(void) case IO_RELOAD_NOOP: msg = _("Data were already loaded"); break; + case IO_RELOAD_ERROR: + EXIT(_("Cannot open data file")); } status_mesg(msg, ""); } -- cgit v1.2.3-54-g00ecf