summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Fleischer <calcurse@cryptocrack.de>2013-02-02 16:39:16 +0100
committerLukas Fleischer <calcurse@cryptocrack.de>2013-02-02 16:39:16 +0100
commit308ba7c983c34c9b9b7d46f360f689b609c1f802 (patch)
tree686d277869d4426f7c200373cead8e939250fa3d
parent9a6df45c4b44ca2a9559add78c1bfe692ec485b8 (diff)
parent93767ce29c6ea41c40808276aa0ae9fc60d5eca5 (diff)
downloadcalcurse-308ba7c983c34c9b9b7d46f360f689b609c1f802.tar.gz
calcurse-308ba7c983c34c9b9b7d46f360f689b609c1f802.zip
Merge branch 'maint'
-rw-r--r--src/interaction.c7
-rw-r--r--src/io.c6
2 files changed, 8 insertions, 5 deletions
diff --git a/src/interaction.c b/src/interaction.c
index d048239..c313ce9 100644
--- a/src/interaction.c
+++ b/src/interaction.c
@@ -107,7 +107,8 @@ static void update_start_time(long *start, long *dur)
const char *msg_enter = _("Press [Enter] to continue");
do {
- day_edit_time(*start, &hr, &mn);
+ if (!day_edit_time(*start, &hr, &mn))
+ break;
newtime = update_time_in_date(*start, hr, mn);
if (newtime < *start + *dur) {
*dur -= (newtime - *start);
@@ -126,8 +127,8 @@ static void update_duration(long *start, long *dur)
{
unsigned newdur;
- day_edit_duration(*start, *dur, &newdur);
- *dur = newdur;
+ if (day_edit_duration(*start, *dur, &newdur))
+ *dur = newdur;
}
static void update_desc(char **desc)
diff --git a/src/io.c b/src/io.c
index 2ae19d0..ff8d1ea 100644
--- a/src/io.c
+++ b/src/io.c
@@ -526,7 +526,8 @@ void io_load_app(void)
if (c == '!') {
ungetc(c, data_file);
recur_exc_scan(&exc, data_file);
- c = getc(data_file);
+ while ((c = getc(data_file)) == ' ') ;
+ ungetc(c, data_file);
} else if (c == '}') {
while ((c = getc(data_file)) == ' ') ;
ungetc(c, data_file);
@@ -535,7 +536,8 @@ void io_load_app(void)
} else if (c == '!') { /* endless item with exceptions */
ungetc(c, data_file);
recur_exc_scan(&exc, data_file);
- c = getc(data_file);
+ while ((c = getc(data_file)) == ' ') ;
+ ungetc(c, data_file);
until.tm_year = 0;
} else {
io_load_error(path_apts, line,