Merge remote-tracking branch 'upstream/master' into gaps

This commit is contained in:
KoffeinFlummi 2015-08-19 00:05:18 +02:00
commit c75d5ceba4
13 changed files with 289 additions and 150 deletions

View file

@ -188,9 +188,10 @@ bool read_config(FILE *file, bool is_active) {
int temp_depth = 0; // Temporary: skip all config sections with depth
while (!feof(file)) {
int _;
char *line = read_line(file);
strip_comments(line);
strip_whitespace(line);
line = strip_comments(line);
line = strip_whitespace(line, &_);
if (!line[0]) {
goto _continue;
}