[banshee] u1ms: Guard against a null DBusCommandService
- From: Bertrand Lorentz <blorentz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [banshee] u1ms: Guard against a null DBusCommandService
- Date: Tue, 1 Nov 2011 20:40:10 +0000 (UTC)
commit 771e8dc86ab05def1e766f5a1e3658cf31408db3
Author: Bertrand Lorentz <bertrand lorentz gmail com>
Date: Tue Nov 1 21:28:54 2011 +0100
u1ms: Guard against a null DBusCommandService
This fixes a failure in the unit tests, as DBus is not initialized in
this case.
.../UbuntuOneMusicStoreSource.cs | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/src/Extensions/Banshee.UbuntuOneMusicStore/Banshee.UbuntuOneMusicStore/UbuntuOneMusicStoreSource.cs b/src/Extensions/Banshee.UbuntuOneMusicStore/Banshee.UbuntuOneMusicStore/UbuntuOneMusicStoreSource.cs
index 6cedff0..b3e332c 100644
--- a/src/Extensions/Banshee.UbuntuOneMusicStore/Banshee.UbuntuOneMusicStore/UbuntuOneMusicStoreSource.cs
+++ b/src/Extensions/Banshee.UbuntuOneMusicStore/Banshee.UbuntuOneMusicStore/UbuntuOneMusicStoreSource.cs
@@ -60,7 +60,10 @@ namespace Banshee.UbuntuOneMusicStore
}
// So we can handle u1ms:// URIs
- ServiceManager.Get<DBusCommandService> ().ArgumentPushed += OnCommandLineArgument;
+ var dbus_service = ServiceManager.Get<DBusCommandService> ();
+ if (dbus_service != null) {
+ dbus_service.ArgumentPushed += OnCommandLineArgument;
+ }
// make sure that the u1ms uri gets handled on banshee startup
foreach (string uri in ApplicationContext.CommandLine.Files) {
@@ -73,7 +76,10 @@ namespace Banshee.UbuntuOneMusicStore
~UbuntuOneMusicStoreSource ()
{
- ServiceManager.Get<DBusCommandService> ().ArgumentPushed -= OnCommandLineArgument;
+ var dbus_service = ServiceManager.Get<DBusCommandService> ();
+ if (dbus_service != null) {
+ dbus_service.ArgumentPushed -= OnCommandLineArgument;
+ }
}
// A count of 0 will be hidden in the source TreeView
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]