1
0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-16 01:57:09 +00:00

Vallimar master (#566)

* Fixes compile issue with builtin config.

* Fix copy-paste mistake.
This commit is contained in:
Brenden Matthews 2018-08-05 08:40:22 -04:00 committed by lasers
parent 1d5c5238b2
commit c771698d5a

View File

@ -2704,7 +2704,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