mirror of
https://github.com/Llewellynvdm/conky.git
synced 2024-12-25 04:06:03 +00:00
fixed the 'can't find ~/.conkyrc bug.
' by checking that the file actually existed. if it didn't, then just used default_configuration git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@184 7f574dfc-610e-0410-a909-a81674777703
This commit is contained in:
parent
72ea302dfb
commit
bc36a9500e
@ -4298,10 +4298,11 @@ int main(int argc, char **argv)
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (current_config != NULL)
|
if (current_config != NULL && fopen((const char *)current_config, (const char *)"r"))
|
||||||
load_config_file(current_config);
|
load_config_file(current_config);
|
||||||
else
|
else {
|
||||||
set_default_configurations();
|
set_default_configurations();
|
||||||
|
}
|
||||||
|
|
||||||
#ifdef MAIL_FILE
|
#ifdef MAIL_FILE
|
||||||
if (current_mail_spool == NULL) {
|
if (current_mail_spool == NULL) {
|
||||||
|
Loading…
Reference in New Issue
Block a user