From 44fa99777010a1f32470002c96c7ae2093e788c8 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Tue, 27 Jun 2017 17:09:37 +0200 Subject: [PATCH] fix(IncallFullscreenWindow): avoid invalid access to incall id --- ui/views/App/Calls/IncallFullscreenWindow.qml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ui/views/App/Calls/IncallFullscreenWindow.qml b/ui/views/App/Calls/IncallFullscreenWindow.qml index 50a791760..4486953f4 100644 --- a/ui/views/App/Calls/IncallFullscreenWindow.qml +++ b/ui/views/App/Calls/IncallFullscreenWindow.qml @@ -23,6 +23,12 @@ Window { // --------------------------------------------------------------------------- function exit (cb) { + // `exit` is called by `Incall.qml`. + // The `incall` id can be null if the window was closed in this view. + if (!incall) { + return + } + // It's necessary to call `showNormal` before close on MacOs // because the dock will be hidden forever! incall.visible = false