From 2f4005083452d61ddaf7542b195927b1d0d6227f Mon Sep 17 00:00:00 2001
From: RblSb <msrblsb@gmail.com>
Date: Tue, 12 May 2020 05:53:12 +0300
Subject: Fix setNext item button

---
 src/VideoList.hx     | 4 +++-
 src/client/Player.hx | 2 +-
 src/server/Main.hx   | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/VideoList.hx b/src/VideoList.hx
index e2d88d5..0799cfa 100644
--- a/src/VideoList.hx
+++ b/src/VideoList.hx
@@ -39,10 +39,12 @@ abstract VideoList(Array<VideoItem>) from Array<VideoItem> to Array<VideoItem> {
 		else this.insert(itemPos + 1, item);
 	}
 
-	public function setNextItem(pos:Int, itemPos:Int):Void {
+	public function setNextItem(pos:Int, itemPos:Int):Int {
 		final next = this[pos];
 		this.remove(next);
+		if (pos < itemPos) itemPos--;
 		this.insert(itemPos + 1, next);
+		return itemPos;
 	}
 
 	public function toggleItemType(pos:Int):Void {
diff --git a/src/client/Player.hx b/src/client/Player.hx
index b0b52a7..ad10814 100644
--- a/src/client/Player.hx
+++ b/src/client/Player.hx
@@ -73,7 +73,7 @@ class Player {
 	}
 
 	public function setNextItem(pos:Int):Void {
-		items.setNextItem(pos, itemPos);
+		itemPos = items.setNextItem(pos, itemPos);
 
 		final next = videoItemsEl.children[pos];
 		videoItemsEl.removeChild(next);
diff --git a/src/server/Main.hx b/src/server/Main.hx
index 6104446..b4fe68e 100644
--- a/src/server/Main.hx
+++ b/src/server/Main.hx
@@ -519,7 +519,7 @@ class Main {
 				if (!checkPermission(client, ChangeOrderPerm)) return;
 				final pos = data.setNextItem.pos;
 				if (pos == itemPos || pos == itemPos + 1) return;
-				videoList.setNextItem(pos, itemPos);
+				itemPos = videoList.setNextItem(pos, itemPos);
 				broadcast(data);
 
 			case ToggleItemType:
-- 
cgit v1.2.3