From 6e202646f42adc4fdd3864c17e20cfbdeb764799 Mon Sep 17 00:00:00 2001
From: hodasemi <michaelh.95@t-online.de>
Date: Tue, 4 Dec 2018 10:04:58 +0100
Subject: [PATCH] Fix skip command and add compile flags for release build

---
 Cargo.toml                  |  5 +++++
 src/player/commands/skip.rs | 19 ++++++++++++-------
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 821c891..b3df8a8 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -27,3 +27,8 @@ branch = "current"
 
 [dependencies.parking_lot]
 version = "^0.5"
+
+[profile.release]
+opt-level = 3
+lto = true
+codegen-units = 4
\ No newline at end of file
diff --git a/src/player/commands/skip.rs b/src/player/commands/skip.rs
index 71dc9c0..08cd249 100644
--- a/src/player/commands/skip.rs
+++ b/src/player/commands/skip.rs
@@ -74,14 +74,19 @@ impl serenity::framework::standard::Command for Skip {
                     }
                 };
 
-                *song = Some(handler.play_returning(source));
-                let song_name = self.media.name_mut();
-                *song_name.borrow_mut() = first.name.clone();
+                match self.media.next_callback.borrow().as_ref() {
+                    Some(callback) => {
+                        *song = Some(handler.play_returning_and_callback(source, callback.clone()));
+                        let song_name = self.media.name_mut();
+                        *song_name.borrow_mut() = first.name.clone();
 
-                print_error!(
-                    msg.channel_id
-                        .say(format!("Skipped current song, now playing: {}", first.name))
-                );
+                        print_error!(
+                            msg.channel_id
+                                .say(format!("Skipped current song, now playing: {}", first.name))
+                        );
+                    }
+                    None => println!("error getting callback from media"),
+                }
             }
         }