From 396e46036436ebc9737b1a777472ba7da455e43e Mon Sep 17 00:00:00 2001
From: svenhoefer <svenhoefer@svenhoefer.com>
Date: Sun, 26 Jul 2020 23:03:57 +0200
Subject: [PATCH] - movieplayer: try to fix bookmark menu

Signed-off-by: Thilo Graf <dbt@novatux.de>
---
 src/gui/movieplayer.cpp | 12 ++++++------
 src/gui/movieplayer.h   |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/gui/movieplayer.cpp b/src/gui/movieplayer.cpp
index 89794128c..f399f0abe 100644
--- a/src/gui/movieplayer.cpp
+++ b/src/gui/movieplayer.cpp
@@ -1989,9 +1989,7 @@ void CMoviePlayerGui::PlayFileLoop(void)
 				callInfoViewer();
 		} else if (msg == (neutrino_msg_t) g_settings.mpkey_bookmark) {
 #if HAVE_COOL_HARDWARE || HAVE_ARM_HARDWARE
-                        if (is_file_player)
-                                selectChapter();
-                        else
+                        if (is_file_player && selectChapter() == -1)
 #endif
                                 handleMovieBrowser((neutrino_msg_t) g_settings.mpkey_bookmark, position);
                         update_lcd = true;
@@ -2899,10 +2897,10 @@ void CMoviePlayerGui::showHelp()
 	helpbox.hide();
 }
 
-void CMoviePlayerGui::selectChapter()
+int CMoviePlayerGui::selectChapter()
 {
 	if (!is_file_player)
-		return;
+		return 1;
 
 	std::vector<int> positions; std::vector<std::string> titles;
 	playback->GetChapters(positions, titles);
@@ -2912,7 +2910,7 @@ void CMoviePlayerGui::selectChapter()
 	playback->GetTitles(playlists, ptitles, current);
 
 	if (positions.empty() && playlists.empty())
-		return;
+		return -1;
 
 	CMenuWidget ChSelector(LOCALE_MOVIEBROWSER_MENU_MAIN_BOOKMARKS, NEUTRINO_ICON_AUDIO);
 	//ChSelector.addIntroItems();
@@ -2955,6 +2953,8 @@ void CMoviePlayerGui::selectChapter()
 		currentapid = 0;
 		playback->SetTitle(playlists[pselect]);
 	}
+
+	return 0;
 }
 
 std::string CMoviePlayerGui::getAPIDDesc(unsigned int i)
diff --git a/src/gui/movieplayer.h b/src/gui/movieplayer.h
index 0daf2d1eb..305bbef0a 100644
--- a/src/gui/movieplayer.h
+++ b/src/gui/movieplayer.h
@@ -234,7 +234,7 @@ class CMoviePlayerGui : public CMenuTarget
 	void updateLcd(bool display_playtime = false);
 
 	bool convertSubtitle(std::string &text);
-	void selectChapter();
+	int selectChapter();
 	void selectAutoLang();
 	void parsePlaylist(CFile *file);
 	bool mountIso(CFile *file);