rhythmbox r6253 - in trunk: . sources

[jmatthew svn gnome org]

Author: jmatthew
Date: Thu Mar 26 12:39:40 2009
New Revision: 6253
URL: http://svn.gnome.org/viewvc/rhythmbox?rev=6253&view=rev

Log:
2009-03-26  Jonathan Matthew  <jonathan d14n org>

	* sources/rb-auto-playlist-source.c: (impl_search):
	If we don't have the base query yet, defer the search until we do.
	Fixes #576846.


Modified:
   trunk/ChangeLog
   trunk/sources/rb-auto-playlist-source.c

Modified: trunk/sources/rb-auto-playlist-source.c
==============================================================================
--- trunk/sources/rb-auto-playlist-source.c	(original)
+++ trunk/sources/rb-auto-playlist-source.c	Thu Mar 26 12:39:40 2009
@@ -513,6 +513,13 @@
 	db = rb_playlist_source_get_db (RB_PLAYLIST_SOURCE (asource));
 	priv->search_query = rb_source_search_create_query (search, db, new_text);
 
+	/* if we don't have the base query yet, we can't do searches */
+	if (priv->cached_all_query == NULL) {
+		rb_debug ("deferring search for \"%s\" until we have the base query", new_text ? new_text : "<NULL>");
+		priv->search_on_completion = TRUE;
+		return;
+	}
+
 	/* we can only do subset searches once the original query is complete */
 	subset = rb_source_search_is_subset (search, cur_text, new_text);
 	if (priv->query_active && subset) {