Merge remote-tracking branch 'uncool/cst-next'

Origin commit data
------------------
Branch: ni/coolstream
Commit: 2d949bce16
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-12-15 (Tue, 15 Dec 2015)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2015-12-15 17:29:18 +01:00
35 changed files with 268 additions and 108 deletions

View File

@@ -55,7 +55,7 @@ bool CConfigFile::loadConfig(const char * const filename, char _delimiter)
{
std::ifstream configFile(filename);
if (configFile != NULL)
if (configFile.good())
{
std::string s;
clear();
@@ -97,7 +97,7 @@ bool CConfigFile::saveConfig(const char * const filename, char _delimiter)
unlink(tmpname.c_str());
std::fstream configFile(tmpname.c_str(), std::ios::out);
if (configFile != NULL)
if (configFile.good())
{
std::cout << "[ConfigFile] saving " << filename << std::endl;
for (ConfigDataMap::const_iterator it = configData.begin(); it != configData.end(); ++it)