diff --git a/src/timerd/timermanager.cpp b/src/timerd/timermanager.cpp index 6d08e8391..ad6262ead 100644 --- a/src/timerd/timermanager.cpp +++ b/src/timerd/timermanager.cpp @@ -414,10 +414,10 @@ void CTimerManager::loadEventsFromConfig() { CConfigFile config(','); - if(!config.loadConfig(CONFIGFILE)) + if(!config.loadConfig(TIMERDCONFIGFILE)) { /* set defaults if no configuration file exists */ - dprintf("%s not found\n", CONFIGFILE); + dprintf("%s not found\n", TIMERDCONFIGFILE); } else { @@ -624,13 +624,13 @@ void CTimerManager::loadRecordingSafety() { CConfigFile config(','); - if(!config.loadConfig(CONFIGFILE)) + if(!config.loadConfig(TIMERDCONFIGFILE)) { /* set defaults if no configuration file exists */ - dprintf("%s not found\n", CONFIGFILE); + dprintf("%s not found\n", TIMERDCONFIGFILE); m_extraTimeStart = 300; m_extraTimeEnd = 300; - config.saveConfig(CONFIGFILE); + config.saveConfig(TIMERDCONFIGFILE); } else { @@ -659,8 +659,8 @@ void CTimerManager::saveEventsToConfig() dprintf("setting EXTRA_TIME_START to %d\n",m_extraTimeStart); config.setInt32 ("EXTRA_TIME_END", m_extraTimeEnd); dprintf("setting EXTRA_TIME_END to %d\n",m_extraTimeEnd); - dprintf("now saving config to %s...\n",CONFIGFILE); - config.saveConfig(CONFIGFILE); + dprintf("now saving config to %s...\n",TIMERDCONFIGFILE); + config.saveConfig(TIMERDCONFIGFILE); dprintf("config saved!\n"); m_saveEvents=false; diff --git a/src/timerd/timermanager.h b/src/timerd/timermanager.h index 26930d7a7..708171d3e 100644 --- a/src/timerd/timermanager.h +++ b/src/timerd/timermanager.h @@ -35,7 +35,7 @@ #include #include -#define CONFIGFILE CONFIGDIR "/timerd.conf" +#define TIMERDCONFIGFILE CONFIGDIR "/timerd.conf" class CTimerEvent {