From cf25f3c072f11455e21323bc41feb4f6729a5512 Mon Sep 17 00:00:00 2001
From: Christian Muehlhaeuser <muesli@gmail.com>
Date: Mon, 29 Aug 2011 16:01:53 +0200
Subject: [PATCH] * Some debug and safety meassures.

---
 .../database/databasecommand_loadops.cpp          | 15 +++++++++++++++
 src/libtomahawk/database/databaseworker.cpp       |  1 +
 src/sip/jabber/avatarmanager.cpp                  |  4 ++--
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/libtomahawk/database/databasecommand_loadops.cpp b/src/libtomahawk/database/databasecommand_loadops.cpp
index 730060170..1c84539b4 100644
--- a/src/libtomahawk/database/databasecommand_loadops.cpp
+++ b/src/libtomahawk/database/databasecommand_loadops.cpp
@@ -26,6 +26,21 @@ DatabaseCommand_loadOps::exec( DatabaseImpl* dbi )
 {
     QList< dbop_ptr > ops;
 
+    {
+        TomahawkSqlQuery query = dbi->newquery();
+        query.prepare( QString( "SELECT id FROM oplog WHERE guid = ?" ) );
+        query.addBindValue( m_since );
+        query.exec();
+
+        if ( !query.next() )
+        {
+            tLog() << "Unknown oplog guid, requested, not replying:" << m_since;
+            Q_ASSERT( false );
+            emit done( m_since, m_since, ops );
+            return;
+        }
+    }
+
     TomahawkSqlQuery query = dbi->newquery();
     query.prepare( QString(
                    "SELECT guid, command, json, compressed, singleton "
diff --git a/src/libtomahawk/database/databaseworker.cpp b/src/libtomahawk/database/databaseworker.cpp
index 9498e81be..93791cdab 100644
--- a/src/libtomahawk/database/databaseworker.cpp
+++ b/src/libtomahawk/database/databaseworker.cpp
@@ -110,6 +110,7 @@ DatabaseWorker::doWork()
     try
     {
         {
+            tDebug() << "Executing cmd:" << cmd->guid();
             cmd->_exec( m_dbimpl ); // runs actual SQL stuff
 
             if ( cmd->loggable() )
diff --git a/src/sip/jabber/avatarmanager.cpp b/src/sip/jabber/avatarmanager.cpp
index 0a925cc86..a781a2842 100644
--- a/src/sip/jabber/avatarmanager.cpp
+++ b/src/sip/jabber/avatarmanager.cpp
@@ -82,8 +82,8 @@ void AvatarManager::onNewPresence(const Jreen::Presence& presence)
 //            qDebug() << presence.from().full() << "vcard: photo already cached no request necessary " << update->photoHash();
             m_JidsAvatarHashes.insert( update->photoHash(), presence.from().bare() );
 
-            Q_ASSERT(!this->avatar(presence.from().bare()).isNull());
-            emit newAvatar(presence.from().bare());
+            if ( !this->avatar( presence.from().bare() ).isNull() )
+                emit newAvatar(presence.from().bare());
         }
     }
     else