diff --git a/Opus/Code/MainActivity.cs b/Opus/Code/MainActivity.cs index 5d9c4a4..3acbee4 100644 --- a/Opus/Code/MainActivity.cs +++ b/Opus/Code/MainActivity.cs @@ -184,8 +184,8 @@ namespace Opus protected override void OnResume() { base.OnResume(); - Paused = false; instance = this; + Paused = false; if ((CastContext == null || CastContext.SessionManager.CurrentSession == null) && MusicPlayer.CurrentID() == -1) MusicPlayer.currentID = MusicPlayer.RetrieveQueueSlot(); diff --git a/Opus/Code/UI/Fragments/PlaylistTracks.cs b/Opus/Code/UI/Fragments/PlaylistTracks.cs index e999ea9..be1efba 100644 --- a/Opus/Code/UI/Fragments/PlaylistTracks.cs +++ b/Opus/Code/UI/Fragments/PlaylistTracks.cs @@ -140,7 +140,6 @@ namespace Opus.Fragments MainActivity.instance.SupportActionBar.SetDisplayHomeAsUpEnabled(false); MainActivity.instance.SupportActionBar.SetDisplayShowTitleEnabled(true); MainActivity.instance.SupportActionBar.SetDisplayShowTitleEnabled(false); - MainActivity.instance.FindViewById(Resource.Id.toolbarLogo).Visibility = ViewStates.Visible; MainActivity.instance.contentRefresh.Refresh -= OnRefresh; Activity.FindViewById(Resource.Id.appbar).RemoveOnOffsetChangedListener(this); @@ -164,7 +163,7 @@ namespace Opus.Fragments } instance = null; } - base.OnDestroyView(); + base.OnDestroyView(); } @@ -558,7 +557,7 @@ namespace Opus.Fragments base.OnResume(); instance = this; - if(useHeader) + if (useHeader) { if (!Activity.FindViewById(Resource.Id.headerPlay).HasOnClickListeners) Activity.FindViewById(Resource.Id.headerPlay).Click += (sender, e0) => { PlaylistManager.PlayInOrder(item); }; @@ -585,5 +584,11 @@ namespace Opus.Fragments MainActivity.instance.SupportActionBar.SetDisplayShowTitleEnabled(true); } } + + public override void OnDestroy() + { + base.OnDestroy(); + MainActivity.instance.FindViewById(Resource.Id.toolbarLogo).Visibility = ViewStates.Visible; + } } }