Fixes #552 - Don't try to use DBs with a too new schema version

[quassel.git] / src / core / corenetwork.cpp

diff --git a/src/core/corenetwork.cpp b/src/core/corenetwork.cpp
index 3dc0cc2..b4a6d86 100644 (file)
--- a/src/core/corenetwork.cpp
+++ b/src/core/corenetwork.cpp
@@ -403,7 +403,9 @@ void CoreNetwork::networkInitialized() {
   }
 
   // restore away state
-  userInputHandler()->handleAway(BufferInfo(), Core::awayMessage(userId(), networkId()));
+  QString awayMsg = Core::awayMessage(userId(), networkId());
+  if(!awayMsg.isEmpty())
+    userInputHandler()->handleAway(BufferInfo(), Core::awayMessage(userId(), networkId()));
 
   // restore old user modes if server default mode is set.
   IrcUser *me_ = me();
@@ -516,7 +518,7 @@ void CoreNetwork::doAutoReconnect() {
 
 void CoreNetwork::sendPing() {
   if(!gotPong()) {
-    disconnectFromIrc(false, QString("No Ping reply in %1 seconds.").arg(_pingTimer.interval() / 1000), true /* withReconnect */);
+    // disconnectFromIrc(false, QString("No Ping reply in %1 seconds.").arg(_pingTimer.interval() / 1000), true /* withReconnect */);
   } else {
     _gotPong = false;
     userInputHandler()->handlePing(BufferInfo(), QString());