[Pkg-cli-apps-commits] [SCM] banshee branch, master, updated. debian/2.0.1-4-2-g009ff1b

[Chow Loong Jin]

The following commit has been merged in the master branch:
commit 378c24b573ca09138094b0e85e8027e014e6d732
Author: Chow Loong Jin <hyperair at ubuntu.com>
Date:   Wed Aug 10 15:23:18 2011 +0800

    Add patch to fix NRE while reloading db models
    
    Closes: #637266

diff --git a/debian/patches/fix-nre-db-reload.patch b/debian/patches/fix-nre-db-reload.patch
new file mode 100644
index 0000000..0540853
--- /dev/null
+++ b/debian/patches/fix-nre-db-reload.patch
@@ -0,0 +1,19 @@
+From: Chow Loong Jin <hyperair at ubuntu.com>
+Description: Fix NRE while reloading database models
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=637266
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=656246
+Index: banshee/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseTrackListModel.cs
+===================================================================
+--- banshee.orig/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseTrackListModel.cs	2011-08-10 11:18:54.973264490 +0800
++++ banshee/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseTrackListModel.cs	2011-08-10 15:20:43.757094187 +0800
+@@ -273,7 +273,9 @@
+                 bool found = (reloadTrigger == null);
+                 foreach (IFilterListModel filter in source.CurrentFilters) {
+                     if (found) {
+-                        reload_models.Add (filter);
++                        if (filter != null) {
++                            reload_models.Add (filter);
++                        }
+                     } else if (filter == reloadTrigger) {
+                         found = true;
+                     }
diff --git a/debian/patches/series b/debian/patches/series
index fa4de07..be0c6c1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,4 +7,5 @@
 08_remove_unrelevant_media.patch
 0001-Revert-ArtworkManager-Cache-null-artwork-for-fast-lo.patch
 0001-dbus-Replace-NDesk.DBus-references-by-dbus-sharp-bgo.patch
+fix-nre-db-reload.patch
 99_ltmain_as-needed.patch

-- 
banshee