From ff3e90d91d60f2eadb1610703261d8d8be2e1333 Mon Sep 17 00:00:00 2001
From: Andrzej Rybczak <electricityispower@gmail.com>
Date: Mon, 29 Jun 2009 02:19:40 +0200
Subject: [PATCH] fix database update

---
 src/mpdpp.cpp  |  2 +-
 src/status.cpp | 28 ++++++++++++++++++----------
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/src/mpdpp.cpp b/src/mpdpp.cpp
index 566ecf6a..694eda1b 100644
--- a/src/mpdpp.cpp
+++ b/src/mpdpp.cpp
@@ -160,7 +160,7 @@ void Connection::UpdateStatus()
 		{
 			itsChanges.Playlist = 1;
 			itsChanges.SongID = 1;
-			itsChanges.Database = 0;
+			itsChanges.Database = 1;
 			itsChanges.DBUpdating = 1;
 			itsChanges.Volume = 1;
 			itsChanges.ElapsedTime = 1;
diff --git a/src/status.cpp b/src/status.cpp
index 40324e82..4421db0f 100644
--- a/src/status.cpp
+++ b/src/status.cpp
@@ -282,19 +282,27 @@ void NcmpcppStatusChanged(Connection *Mpd, StatusChanges changed, void *)
 	}
 	if (changed.Database)
 	{
-		myBrowser->GetDirectory(myBrowser->CurrentDir());
+		if (myBrowser->Main())
+			myBrowser->GetDirectory(myBrowser->CurrentDir());
 #		ifdef HAVE_TAGLIB_H
-		myTagEditor->Albums->Clear(0);
-		myTagEditor->Dirs->Clear(0);
-#		endif // HAVE_TAGLIB_H
-		if (myLibrary->Columns() == 2)
+		if (myTagEditor->Main())
 		{
-			myLibrary->Albums->Clear();
-			myLibrary->Songs->Clear(0);
+			myTagEditor->Albums->Clear(0);
+			myTagEditor->Dirs->Clear(0);
 		}
-		else
-			myLibrary->Artists->Clear(0);
-		myPlaylistEditor->Content->Clear(0);
+#		endif // HAVE_TAGLIB_H
+		if (myLibrary->Main())
+		{
+			if (myLibrary->Columns() == 2)
+			{
+				myLibrary->Albums->Clear();
+				myLibrary->Songs->Clear(0);
+			}
+			else
+				myLibrary->Artists->Clear(0);
+		}
+		if (myPlaylistEditor->Main())
+			myPlaylistEditor->Content->Clear(0);
 	}
 	if (changed.PlayerState)
 	{