banshee r4860 - in trunk/banshee: . src/Core/Banshee.Services/Banshee.Collection.Database src/Extensions/Banshee.AudioCd/Banshee.AudioCd

[gburt svn gnome org]

Author: gburt
Date: Fri Dec 19 19:33:43 2008
New Revision: 4860
URL: http://svn.gnome.org/viewvc/banshee?rev=4860&view=rev

Log:
2008-12-19  Gabriel Burt  <gabriel burt gmail com>

	* src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs: Fix
	crasher bug with using Banshee in a language that has a non-ASCII
	character in "Audio CD" (BGO #565059).

	* src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseTrackInfo.cs:
	Prevent NRE.


Modified:
   trunk/banshee/ChangeLog
   trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseTrackInfo.cs
   trunk/banshee/src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs

Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseTrackInfo.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseTrackInfo.cs	(original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseTrackInfo.cs	Fri Dec 19 19:33:43 2008
@@ -163,7 +163,7 @@
 
             ProviderSave ();
 
-            if (notify) {
+            if (notify && PrimarySource != null) {
                 if (is_new) {
                     PrimarySource.NotifyTracksAdded ();
                 } else {

Modified: trunk/banshee/src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs
==============================================================================
--- trunk/banshee/src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs	(original)
+++ trunk/banshee/src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs	Fri Dec 19 19:33:43 2008
@@ -55,7 +55,8 @@
         {
             this.service = service;
             this.disc_model = discModel;
-            TypeUniqueId = discModel.Title;
+
+            TypeUniqueId = "";
             
             Properties.SetString ("TrackView.ColumnControllerXml", String.Format (@"
                 <column-controller>