Merge pull request #154 from adasauce/image-modal-download

Better image overlay handling when downloading

1 files changed, 14 insertions, 3 deletions

diff --git a/src/timeline/TimelineViewManager.cpp b/src/timeline/TimelineViewManager.cpp

index 44e26921..eead46a2 100644
--- a/src/timeline/TimelineViewManager.cpp
+++ b/src/timeline/TimelineViewManager.cpp
@@ -175,9 +175,20 @@ TimelineViewManager::openImageOverlay(QString mxcUrl, QString eventId) const
 
                 auto imgDialog = new dialogs::ImageOverlay(pixmap);
                 imgDialog->showFullScreen();
-                connect(imgDialog, &dialogs::ImageOverlay::saving, timeline_, [this, eventId]() {
-                        timeline_->saveMedia(eventId);
-                });
+                connect(imgDialog,
+                        &dialogs::ImageOverlay::saving,
+                        timeline_,
+                        [this, eventId, imgDialog]() {
+                                // hide the overlay while presenting the save dialog for better
+                                // cross platform support.
+                                imgDialog->hide();
+
+                                if (!timeline_->saveMedia(eventId)) {
+                                        imgDialog->show();
+                                } else {
+                                        imgDialog->close();
+                                }
+                        });
         });
 }