From c969b91cd89ec4ac59370fc3a5ab19c08be78b79 Mon Sep 17 00:00:00 2001
From: Jason Brewer <jason.brewer101@gmail.com>
Date: Mon, 16 Dec 2019 14:32:12 +0000
Subject: [PATCH] Revert "LUSHDigital/lrpi_tablet_ui#37 and
 LUSHDigital/lrpi_player#137 - error message is now displayed instead of an
 infinitely spinning wheel (#40)"

This reverts commit 907dae63c6a7928d3e26205921128ff2904be997.
---
 src/app/app.component.css                                | 9 ++-------
 src/app/app.component.html                               | 1 +
 src/app/pages/track-selector/track-selector.component.ts | 4 +---
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/app/app.component.css b/src/app/app.component.css
index 026d699..188d3b5 100644
--- a/src/app/app.component.css
+++ b/src/app/app.component.css
@@ -10,8 +10,8 @@ html {
     font-size: 140%;
 }
 
-.pair-button:hover, .home-button:hover {
-    cursor: pointer; 
+.pair-button:hover {
+    cursor: pointer;
 }
 
 p.slave-prompt {
@@ -21,9 +21,4 @@ p.slave-prompt {
 .pair-button button {
     margin-left: 0.3em;
     font-size: 110%;
-}
-
-.home-button {
-    float: right;
-    padding-right: 1em;
 }
\ No newline at end of file
diff --git a/src/app/app.component.html b/src/app/app.component.html
index 201f024..a95dfec 100644
--- a/src/app/app.component.html
+++ b/src/app/app.component.html
@@ -15,4 +15,5 @@
     <p class="slave-prompt">
         <i>(its IP address is {{masterIp}})</i>
     </p>
+    
 </ng-template>
\ No newline at end of file
diff --git a/src/app/pages/track-selector/track-selector.component.ts b/src/app/pages/track-selector/track-selector.component.ts
index 4799fd5..335b48b 100644
--- a/src/app/pages/track-selector/track-selector.component.ts
+++ b/src/app/pages/track-selector/track-selector.component.ts
@@ -89,6 +89,7 @@ export class TrackSelectorComponent implements OnInit {
         console.log('In the playlist processor');
         
         let data: any = d;
+        this.loading = false;
 
         console.log('tracks: ', data, ' length: ', data.length);
 
@@ -97,7 +98,6 @@ export class TrackSelectorComponent implements OnInit {
 
         if (data.length === undefined) {
           this.errorResponse['message'] = 'Syncing may not have completed yet. Alternatively, is the usb stick plugged in?'
-          this.loading = false;
           this.serverData = null;
           return;
         }
@@ -122,7 +122,6 @@ export class TrackSelectorComponent implements OnInit {
         }
 
         console.log('playlist? : ', isPlaylist);
-        this.loading = false; 
 
         this.serverData = of(
           data
@@ -132,7 +131,6 @@ export class TrackSelectorComponent implements OnInit {
       (err: any) => {
         console.log('error', err);
         this.errorResponse = err;
-        this.loading = false;
         this.errorResponse['message'] = 'Something is wrong...'
         this.router.navigate([`/tracks`]);
       }