summaryrefslogtreecommitdiff
path: root/src/log.cpp
diff options
context:
space:
mode:
authorBertram <bertram@cegetel.net>2010-03-03 23:36:37 +0100
committerBertram <bertram@cegetel.net>2010-03-03 23:36:37 +0100
commit8cc31b582f372238ce6bd2c86888d312cf1fe5b2 (patch)
tree8db5f864348d08a05b8533c7ede58e76741a98f8 /src/log.cpp
parentb1845e9e081df1fc77d9bcbed3ab95792d6ba682 (diff)
parentd564943867452ad76e6d313a28870e640715dded (diff)
downloadmana-client-8cc31b582f372238ce6bd2c86888d312cf1fe5b2.tar.gz
mana-client-8cc31b582f372238ce6bd2c86888d312cf1fe5b2.tar.bz2
mana-client-8cc31b582f372238ce6bd2c86888d312cf1fe5b2.tar.xz
mana-client-8cc31b582f372238ce6bd2c86888d312cf1fe5b2.zip
Merge branch 'master' of gitorious.org:mana/mana
Conflicts: src/being.cpp
Diffstat (limited to 'src/log.cpp')
-rw-r--r--src/log.cpp12
1 files changed, 5 insertions, 7 deletions
diff --git a/src/log.cpp b/src/log.cpp
index 432d1b04..ba1610fd 100644
--- a/src/log.cpp
+++ b/src/log.cpp
@@ -35,7 +35,7 @@
#include <sys/time.h>
Logger::Logger():
- mLogToStandardOut(false),
+ mLogToStandardOut(true),
mChatWindow(NULL)
{
}
@@ -61,11 +61,6 @@ void Logger::setLogFile(const std::string &logFilename)
void Logger::log(const char *log_text, ...)
{
- if (!mLogFile.is_open())
- {
- return;
- }
-
char* buf = new char[1024];
va_list ap;
@@ -94,7 +89,10 @@ void Logger::log(const char *log_text, ...)
<< (int)((tv.tv_usec / 10000) % 100)
<< "] ";
- mLogFile << timeStr.str() << buf << std::endl;
+ if (mLogFile.is_open())
+ {
+ mLogFile << timeStr.str() << buf << std::endl;
+ }
if (mLogToStandardOut)
{