1 files changed, 17 insertions, 11 deletions
diff --git a/src/player-controller.vala b/src/player-controller.vala
index 3ce121e..20479d9 100644
--- a/src/player-controller.vala
+++ b/src/player-controller.vala
@@ -133,7 +133,8 @@ public class PlayerController : GLib.Object
   public void hibernate()
   {
     update_state(PlayerController.state.OFFLINE);
-    this.custom_items[widget_order.TRANSPORT].reset(TransportMenuitem.attributes_format());
+    TransportMenuitem transport = this.custom_items[widget_order.TRANSPORT] as TransportMenuitem;
+    transport.change_play_state (Transport.State.PAUSED);
     this.custom_items[widget_order.METADATA].reset(MetadataMenuitem.attributes_format());
     TitleMenuitem title = this.custom_items[widget_order.TITLE] as TitleMenuitem;
     title.toggle_active_triangle(false); 
@@ -143,20 +144,25 @@ public class PlayerController : GLib.Object
   public void update_layout()
   {     
     PlaylistsMenuitem playlists_menuitem = this.custom_items[widget_order.PLAYLISTS] as PlaylistsMenuitem;
-
     if(this.current_state != state.CONNECTED){
-      this.custom_items[widget_order.TRANSPORT].property_set_bool(MENUITEM_PROP_VISIBLE,
+      this.custom_items[widget_order.METADATA].property_set_bool (MENUITEM_PROP_VISIBLE,
                                                                   false);
-      this.custom_items[widget_order.METADATA].property_set_bool(MENUITEM_PROP_VISIBLE,
-                                                                 false);
-      playlists_menuitem.root_item.property_set_bool ( MENUITEM_PROP_VISIBLE,
-                                                       false );   
+      playlists_menuitem.root_item.property_set_bool (MENUITEM_PROP_VISIBLE,
+                                                      false );
+      this.custom_items[widget_order.TRANSPORT].property_set_bool (MENUITEM_PROP_VISIBLE,
+                                                                   this.app_info.get_id() == "banshee.desktop");         
       return; 
     }
-    this.custom_items[widget_order.METADATA].property_set_bool(MENUITEM_PROP_VISIBLE,
-                                                              this.custom_items[widget_order.METADATA].populated(MetadataMenuitem.attributes_format()));    
-    this.custom_items[widget_order.TRANSPORT].property_set_bool(MENUITEM_PROP_VISIBLE,
-                                                                true);
+    this.custom_items[widget_order.METADATA].property_set_bool (MENUITEM_PROP_VISIBLE,
+                                                                this.custom_items[widget_order.METADATA].populated(MetadataMenuitem.attributes_format()));    
+    if (this.app_info.get_id() == "banshee.desktop"){
+      TransportMenuitem transport = this.custom_items[widget_order.TRANSPORT] as TransportMenuitem;
+      transport.handle_cached_action();
+    }
+    else{
+      this.custom_items[widget_order.TRANSPORT].property_set_bool (MENUITEM_PROP_VISIBLE,
+                                                                   true);         
+    }
     playlists_menuitem.root_item.property_set_bool ( MENUITEM_PROP_VISIBLE,
                                                      this.use_playlists );
   }