Merge pull request #1001 from duarm/master

options to open images/videos with external program by default

2 files changed, 2 insertions, 2 deletions

diff --git a/resources/qml/delegates/ImageMessage.qml b/resources/qml/delegates/ImageMessage.qml

index efd4f4a5..2ee8da7f 100644
--- a/resources/qml/delegates/ImageMessage.qml
+++ b/resources/qml/delegates/ImageMessage.qml
@@ -68,7 +68,7 @@ Item {
     TapHandler {
         //enabled: type == MtxEvent.ImageMessage && (img.status == Image.Ready || mxcimage.loaded)
         onSingleTapped: {
-            TimelineManager.openImageOverlay(room, url, eventId);
+            Settings.openImageExternal ? room.openMedia(eventId) : TimelineManager.openImageOverlay(room, url, eventId);
             eventPoint.accepted = true;
         }
         gesturePolicy: TapHandler.ReleaseWithinBounds
diff --git a/resources/qml/delegates/PlayableMediaMessage.qml b/resources/qml/delegates/PlayableMediaMessage.qml

index 4f19275d..5d7beaad 100644
--- a/resources/qml/delegates/PlayableMediaMessage.qml
+++ b/resources/qml/delegates/PlayableMediaMessage.qml
@@ -52,7 +52,7 @@ Item {
         height: parent.height - fileInfoLabel.height
 
         TapHandler {
-            onTapped: mediaControls.showControls()
+            onTapped: Settings.openVideoExternal ? room.openMedia(eventId) : mediaControls.showControls()
         }
 
         Image {