From 7f7d35fe7f45eeacf1176000cb9710cfe8cf4827 Mon Sep 17 00:00:00 2001
From: Sheldon Knuth <sheldon_knuth@futureland.tk>
Date: Mon, 1 Jul 2019 22:10:13 +0800
Subject: [PATCH] fix audio thread by removing PopError but use customised
 block function instead.

---
 voxygen/src/audio/base.rs | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/voxygen/src/audio/base.rs b/voxygen/src/audio/base.rs
index 6185352a31..fd04a0f8f7 100644
--- a/voxygen/src/audio/base.rs
+++ b/voxygen/src/audio/base.rs
@@ -3,7 +3,7 @@ use common::assets::{load_from_path, read_from_assets};
 use crossbeam::{
     atomic::AtomicCell,
     channel::{unbounded, Receiver, Sender},
-    queue::{PopError, SegQueue},
+    queue::SegQueue,
     sync::{ShardedLock, WaitGroup},
 };
 use rodio::{Decoder, Device, Sink, SpatialSink};
@@ -155,19 +155,20 @@ impl MonoMode for AudioPlayer {
                 };
                 let mut playback = MonoEmitter::new(&Settings::load().audio);
                 loop {
-                    if let action = event_loop.queue.pop() {
+                    if let Ok(action) = event_loop.queue.pop() {
                         match action {
-                            Ok(Action::Load(path)) => {
+                            Action::Load(path) => {
                                 if playback.stream.empty() {
                                     playback.play_from(&path);
                                     send_msg(&mut tx, AudioPlayerMsg::AudioPlay);
                                 }
                             }
-                            Ok(Action::Stop) => playback.stream.stop(),
-                            Ok(Action::AdjustVolume(value)) => playback.set_volume(value),
-                            Ok(Action::ChangeDevice(device)) => playback.set_device(device),
-                            Err(PopError) => eprintln!("There's no soundtrack in the playlist!"),
+                            Action::Stop => playback.stream.stop(),
+                            Action::AdjustVolume(value) => playback.set_volume(value),
+                            Action::ChangeDevice(device) => playback.set_device(device),
                         }
+                    } else {
+                        block();
                     }
                 }
             });
@@ -212,7 +213,7 @@ impl Jukebox {
 
     /// Display the current genre.
     pub(crate) fn get_genre(self) -> Genre {
-        self.genre.into_inner()
+        self.genre.load()
     }
 }