protect against odd mpris keys

2 files changed, 8 insertions, 3 deletions

diff --git a/.bzrignore b/.bzrignore
index 6b177b5..e47e05c 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -82,3 +82,9 @@ data/com.canonical.indicators.sound.gschema.valid
 tests/libmockpulse.la
 tests/libmockpulse_la-mockpulse.lo
 src/libsoundmenu_la-gen-sound-service.xml.lo
+src/libsoundmenu_la-mute-widget.lo
+src/libsoundmenu_la-sound-state-manager.lo
+src/libsoundmenu_la-sound-state.lo
+src/libsoundmenu_la-voip-input-widget.lo
+src/specific-items-manager.c
+src/stamp-marshal
diff --git a/src/music-player-bridge.vala b/src/music-player-bridge.vala
index 0c9cb10..e7bc1fb 100644
--- a/src/music-player-bridge.vala
+++ b/src/music-player-bridge.vala
@@ -229,14 +229,13 @@ public class MusicPlayerBridge : GLib.Object
   {
     var result = desktop_or_interface;
     var tokens = desktop_or_interface.split( "." );
-    if ( tokens.length > 1 ){
+    if (tokens != null && tokens.length > 1){
       result = tokens[tokens.length - 1];  
     }
     var temp = result.split("-");
-    if (temp.length > 1){
+    if (temp != null && temp.length > 1){
       result = temp[0];
     }
-    debug("determine key result = %s", result);
     return result;        
   }