vlc | branch: master | Pierre Lamot <[email protected]> | Mon Jul 29 17:23:24 
2019 +0200| [f9caa20929614f0368cbbc7ca3d14b4963aa3546] | committer: 
Jean-Baptiste Kempf

qml: cancel should no longer stop the media in the player view

Signed-off-by: Jean-Baptiste Kempf <[email protected]>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f9caa20929614f0368cbbc7ca3d14b4963aa3546
---

 modules/gui/qt/qml/player/ControlBar.qml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gui/qt/qml/player/ControlBar.qml 
b/modules/gui/qt/qml/player/ControlBar.qml
index cfa5d79c9a..dd6eea3f75 100644
--- a/modules/gui/qt/qml/player/ControlBar.qml
+++ b/modules/gui/qt/qml/player/ControlBar.qml
@@ -39,8 +39,8 @@ Utils.NavigableFocusScope {
 
     Keys.priority: Keys.AfterItem
     Keys.onPressed: defaultKeyAction(event, 0)
+    onActionCancel: history.previous(History.Go)
 
-    onActionCancel: mainPlaylistController.stop()
     ColumnLayout {
         anchors.fill: parent
         spacing: 0

_______________________________________________
vlc-commits mailing list
[email protected]
https://mailman.videolan.org/listinfo/vlc-commits

Reply via email to