diff --git a/src/start_end.c b/src/start_end.c index 83295881..a5b200a1 100644 --- a/src/start_end.c +++ b/src/start_end.c @@ -448,11 +448,14 @@ start_week_round(void) if(!query_start_end_season_end() && opt_int("int_opt_skip") && !query_user_games_this_week_round() && + !query_user_events() && ((week_round == 1 && !query_user_games_in_week_round(week - 1, fixture_get_last_week_round(week - 1))) || (week_round > 1 && - !query_user_games_in_week_round(week, week_round - 1)))) + !query_user_games_in_week_round(week, week_round - 1)))) { + user_event_show_next(); end_week_round(); + } else { cur_user = 0; diff --git a/src/user.c b/src/user.c index 931d4a89..8738830a 100644 --- a/src/user.c +++ b/src/user.c @@ -247,6 +247,19 @@ user_set_player_list_attributes(const User *user, PlayerListAttribute *attribute } } +/** Find out whether there are user events. */ +gboolean +query_user_events() +{ + gint i; + + for(i=0;ilen;i++) + if(usr(i).events->len!=0) + return TRUE; + + return FALSE; +} + /** Find out whether there are user games at the specified date. */ gboolean query_user_games_in_week_round(gint week_number, gint week_round_number)