aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorXTZGZoReX <none@none>2009-03-22 12:28:28 +0100
committerXTZGZoReX <none@none>2009-03-22 12:28:28 +0100
commit69b1c1c219e7509ce52d3b5fdb9c5835a263dc24 (patch)
tree19b2489c1ca992e99ab7fa543e4e1ecb61172705 /src
parentb5390f84b9ef023af587558b1ed4cb4e0b7eebb4 (diff)
* Fixed thread deadlock by disabling logging DB errors to DB... Heh.
--HG-- branch : trunk
Diffstat (limited to 'src')
-rw-r--r--src/shared/Log.cpp2
-rw-r--r--src/shared/Log.h1
2 files changed, 2 insertions, 1 deletions
diff --git a/src/shared/Log.cpp b/src/shared/Log.cpp
index 0b2bef26dfe..7a92069f61e 100644
--- a/src/shared/Log.cpp
+++ b/src/shared/Log.cpp
@@ -447,6 +447,7 @@ void Log::outErrorDb( const char * err, ... )
if( !err )
return;
+ /*
if (m_enableLogDB)
{
va_list ap2;
@@ -456,6 +457,7 @@ void Log::outErrorDb( const char * err, ... )
outDB(LOG_TYPE_DBERR, nnew_str);
va_end(ap2);
}
+ */
if(m_colored)
SetColor(false,RED);
diff --git a/src/shared/Log.h b/src/shared/Log.h
index 232c5b5bbb1..dc34f3d585c 100644
--- a/src/shared/Log.h
+++ b/src/shared/Log.h
@@ -47,7 +47,6 @@ enum LogTypes
LOG_TYPE_RA = 7,
LOG_TYPE_GM = 8,
LOG_TYPE_PACKET = 9,
- LOG_TYPE_DBERR = 10,
MAX_LOG_TYPES
};