From d624f2820cc4d33ba5306149fb66066f66e3e051 Mon Sep 17 00:00:00 2001
From: Anonymus Raccoon <32224410+AnonymusRaccoon@users.noreply.github.com>
Date: Thu, 4 Jul 2019 15:28:56 +0200
Subject: [PATCH] Solving a bug and cleaning the build modes.

---
 Opus.sln                                 |  4 ----
 Opus/Code/UI/Fragments/PlaylistTracks.cs |  8 ++++---
 Opus/Opus.csproj                         | 27 ++----------------------
 3 files changed, 7 insertions(+), 32 deletions(-)

diff --git a/Opus.sln b/Opus.sln
index 9775cec..07358b8 100644
--- a/Opus.sln
+++ b/Opus.sln
@@ -8,16 +8,12 @@ EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
-		Release 2|Any CPU = Release 2|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{35E54AD4-5E2B-4DCD-9C20-F715D682A22B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{35E54AD4-5E2B-4DCD-9C20-F715D682A22B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{35E54AD4-5E2B-4DCD-9C20-F715D682A22B}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
-		{35E54AD4-5E2B-4DCD-9C20-F715D682A22B}.Release 2|Any CPU.ActiveCfg = Release 2|Any CPU
-		{35E54AD4-5E2B-4DCD-9C20-F715D682A22B}.Release 2|Any CPU.Build.0 = Release 2|Any CPU
-		{35E54AD4-5E2B-4DCD-9C20-F715D682A22B}.Release 2|Any CPU.Deploy.0 = Release 2|Any CPU
 		{35E54AD4-5E2B-4DCD-9C20-F715D682A22B}.Release|Any CPU.ActiveCfg = Debug|Any CPU
 		{35E54AD4-5E2B-4DCD-9C20-F715D682A22B}.Release|Any CPU.Build.0 = Debug|Any CPU
 		{35E54AD4-5E2B-4DCD-9C20-F715D682A22B}.Release|Any CPU.Deploy.0 = Debug|Any CPU
diff --git a/Opus/Code/UI/Fragments/PlaylistTracks.cs b/Opus/Code/UI/Fragments/PlaylistTracks.cs
index 762d123..022ddfa 100644
--- a/Opus/Code/UI/Fragments/PlaylistTracks.cs
+++ b/Opus/Code/UI/Fragments/PlaylistTracks.cs
@@ -136,26 +136,28 @@ namespace Opus.Fragments
 
         public override void OnDestroyView()
         {
-            MainActivity.instance.RemoveFilterListener(Search);
             Activity.FindViewById<ImageButton>(Resource.Id.headerPlay).Click -= HeaderPlay;
             Activity.FindViewById<ImageButton>(Resource.Id.headerShuffle).Click -= HeaderShuffle;
             Activity.FindViewById<ImageButton>(Resource.Id.headerMore).Click -= PlaylistMore;
+            base.OnDestroyView();
 
             if (!MainActivity.instance.Paused)
             {
                 Activity.FindViewById<RelativeLayout>(Resource.Id.playlistHeader).Visibility = ViewStates.Gone;
 
+                MainActivity.instance.RemoveFilterListener(Search);
                 MainActivity.instance.HideFilter();
                 MainActivity.instance.SupportActionBar.SetHomeButtonEnabled(false);
                 MainActivity.instance.SupportActionBar.SetDisplayHomeAsUpEnabled(false);
                 MainActivity.instance.SupportActionBar.SetDisplayShowTitleEnabled(false);
-                MainActivity.instance.FindViewById(Resource.Id.toolbarLogo).Visibility = ViewStates.Visible;
+
+                if(MainActivity.instance.FindViewById(Resource.Id.toolbarLogo) != null)
+                    MainActivity.instance.FindViewById(Resource.Id.toolbarLogo).Visibility = ViewStates.Visible;
 
                 MainActivity.instance.contentRefresh.Refresh -= OnRefresh;
                 Activity.FindViewById<AppBarLayout>(Resource.Id.appbar).RemoveOnOffsetChangedListener(this);
                 instance = null;
             }
-            base.OnDestroyView();                
         }
 
 
diff --git a/Opus/Opus.csproj b/Opus/Opus.csproj
index 58226f2..dca3d06 100644
--- a/Opus/Opus.csproj
+++ b/Opus/Opus.csproj
@@ -50,34 +50,11 @@
     <MandroidI18n />
     <AndroidDexTool>d8</AndroidDexTool>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugSymbols>false</DebugSymbols>
-    <DebugType>PdbOnly</DebugType>
-    <Optimize>True</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AndroidManagedSymbols>true</AndroidManagedSymbols>
-    <AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>
-    <AndroidLinkMode>SdkOnly</AndroidLinkMode>
-    <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
-    <AotAssemblies>false</AotAssemblies>
-    <EnableLLVM>false</EnableLLVM>
-    <BundleAssemblies>false</BundleAssemblies>
-    <EnableProguard>false</EnableProguard>
-    <AndroidSupportedAbis>armeabi-v7a;x86;x86_64;arm64-v8a</AndroidSupportedAbis>
-    <AndroidEnableMultiDex>true</AndroidEnableMultiDex>
-    <AndroidCreatePackagePerAbi>false</AndroidCreatePackagePerAbi>
-    <JavaMaximumHeapSize>2G</JavaMaximumHeapSize>
-    <AndroidDexTool>d8</AndroidDexTool>
-    <MandroidI18n />
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release 2|AnyCPU'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
     <DebugSymbols>True</DebugSymbols>
     <DebugType>Full</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>bin\Release 2\</OutputPath>
+    <OutputPath>bin\Release\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>