Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-18 02:55:12 +00:00
Code Issues Releases Activity

Merge branch 'master' into master

Browse Source
This commit is contained in:
Brenden Matthews 2018-08-06 09:03:05 -04:00 committed by GitHub
commit 2b3fb682aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/conky.cc
View File

@ -2703,7 +2703,9 @@ void load_config_file() {
} else { } else {
#endif #endif
l.loadfile(current_config.c_str()); l.loadfile(current_config.c_str());
#ifdef BUILD_BUILTIN_CONFIG
} }
#endif
} catch (lua::syntax_error &e) { } catch (lua::syntax_error &e) {
#define SYNTAX_ERR_READ_CONF "Syntax error (%s) while reading config file. " #define SYNTAX_ERR_READ_CONF "Syntax error (%s) while reading config file. "
#ifdef BUILD_OLD_CONFIG #ifdef BUILD_OLD_CONFIG