Fix file overlay leak

1 files changed, 3 insertions, 1 deletions

diff --git a/main/src/ui/conversation_view_controller.vala b/main/src/ui/conversation_view_controller.vala
index 2e11e1e9..888879b0 100644
--- a/main/src/ui/conversation_view_controller.vala
+++ b/main/src/ui/conversation_view_controller.vala
@@ -230,7 +230,7 @@ public class ConversationViewController : Object {
                 }
             }
             if (!something_works && limits.has_key(0)) {
-                if (!something_works && file_info.get_size() > limits[0]) {
+                if (!something_works && file_info.get_size() > limits[0] && overlay != null) {
                     overlay.set_file_too_large();
                 }
             }
@@ -238,8 +238,10 @@ public class ConversationViewController : Object {
 
         overlay.close.connect(() => {
             // We don't want drag'n'drop to be active while the overlay is active
+            view.remove_overlay_dialog();
             overlay_dialog = null;
             update_file_upload_status.begin();
+            overlay = null;
         });
 
         view.add_overlay_dialog(overlay.get_widget());