libdeng2: Fixed crash when doing log output during atexit()

The log buffer has already been destroyed when atexit calls its callbacks.
skyjake · Mar 23, 2013 · a89fcc0 · a89fcc0
1 parent c35524e
commit a89fcc0
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/doomsday/libdeng2/include/de/core/logbuffer.h b/doomsday/libdeng2/include/de/core/logbuffer.h
@@ -163,6 +163,8 @@ class DENG2_PUBLIC LogBuffer : public QObject, public Lockable, DENG2_OBSERVES(F
 
     static LogBuffer &appBuffer();
 
+    static bool isAppBufferAvailable();
+
 public slots:
     /**
      * Flushes all unflushed entries to the defined outputs.

diff --git a/doomsday/libdeng2/src/core/log.cpp b/doomsday/libdeng2/src/core/log.cpp
@@ -551,7 +551,8 @@ void Log::disposeThreadLog()
 
 LogEntryStager::LogEntryStager(LogEntry::Level level, String const &format) : _level(level)
 {
-    _disabled = !LogBuffer::appBuffer().isEnabled(level);
+    _disabled = !LogBuffer::isAppBufferAvailable() ||
+                !LogBuffer::appBuffer().isEnabled(level);
     if(!_disabled)
     {
         _format = format;

diff --git a/doomsday/libdeng2/src/core/logbuffer.cpp b/doomsday/libdeng2/src/core/logbuffer.cpp
@@ -120,6 +120,8 @@ LogBuffer::~LogBuffer()
 
     setOutputFile("");
     clear();
+
+    if(_appBuffer == this) _appBuffer = 0;
 }
 
 void LogBuffer::clear()
@@ -316,4 +318,9 @@ LogBuffer &LogBuffer::appBuffer()
     return *_appBuffer;
 }
 
+bool LogBuffer::isAppBufferAvailable()
+{
+    return _appBuffer != 0;
+}
+
 } // namespace de