Catch recursion in message logger.

diff --git a/src/client/client.cpp b/src/client/client.cpp
index c2a3e16..ca219bb 100644 (file)
--- a/src/client/client.cpp
+++ b/src/client/client.cpp
@@ -51,6 +51,11 @@ AccountId Client::_currentCoreAccount = 0;
 
 /*** Initialization/destruction ***/
 
+bool Client::instanceExists()
+{
+  return instanceptr;
+}
+
 Client *Client::instance() {
   if(!instanceptr)
     instanceptr = new Client();
@@ -496,6 +501,12 @@ void Client::logMessage(QtMsgType type, const char *msg) {
     Quassel::logFatalMessage(msg);
   } else {
     QString msgString = QString("%1\n").arg(msg);
+
+    //Check to see if there is an instance around, else we risk recursions
+    //when calling instance() and creating new ones.
+    if (!instanceExists())
+      return;
+
     instance()->_debugLog << msgString;
     emit instance()->logUpdated(msgString);
   }

diff --git a/src/client/client.h b/src/client/client.h
index 3f5f79d..2821ab9 100644 (file)
--- a/src/client/client.h
+++ b/src/client/client.h
@@ -62,6 +62,7 @@ public:
     RemoteCore
   };
 
+  static bool instanceExists();
   static Client *instance();
   static void destroy();
   static void init(AbstractUi *);