From 400f52d10da8342fac39e7c89e3f2733b2a0ccca Mon Sep 17 00:00:00 2001
From: Christian Muehlhaeuser <muesli@gmail.com>
Date: Sun, 24 Feb 2013 14:09:57 +0100
Subject: [PATCH] * Make sure our private markAsReady method is connected (and
 hence called) first. Log a message when db is ready.

---
 src/libtomahawk/database/Database.cpp | 10 +++++++++-
 src/libtomahawk/database/Database.h   |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/libtomahawk/database/Database.cpp b/src/libtomahawk/database/Database.cpp
index 34e5fc752..a0643178a 100644
--- a/src/libtomahawk/database/Database.cpp
+++ b/src/libtomahawk/database/Database.cpp
@@ -55,9 +55,9 @@ Database::Database( const QString& dbname, QObject* parent )
 
     tDebug() << Q_FUNC_INFO << "Using" << m_maxConcurrentThreads << "database worker threads";
 
+    connect( m_impl, SIGNAL( indexReady() ), SLOT( markAsReady() ) );
     connect( m_impl, SIGNAL( indexReady() ), SIGNAL( indexReady() ) );
     connect( m_impl, SIGNAL( indexReady() ), SIGNAL( ready() ) );
-    connect( m_impl, SIGNAL( indexReady() ), SLOT( setIsReadyTrue() ) );
 
     Q_ASSERT( m_workerRW );
     m_workerRW.data()->start();
@@ -192,3 +192,11 @@ Database::impl()
 
     return m_implHash.value( thread );
 }
+
+
+void
+Database::markAsReady()
+{
+    tLog() << Q_FUNC_INFO << "Database is ready now!";
+    m_ready = true;
+}
diff --git a/src/libtomahawk/database/Database.h b/src/libtomahawk/database/Database.h
index 73b2ea368..0ced93447 100644
--- a/src/libtomahawk/database/Database.h
+++ b/src/libtomahawk/database/Database.h
@@ -71,7 +71,7 @@ public slots:
     void enqueue( const QList< QSharedPointer<DatabaseCommand> >& lc );
 
 private slots:
-    void setIsReadyTrue() { m_ready = true; }
+    void markAsReady();
 
 private:
     bool m_ready;