From 33ae220ad2f9cdd61ca1a6f70e208e3bfb5e654b Mon Sep 17 00:00:00 2001
From: Daniel van Vugt <daniel.van.vugt@canonical.com>
Date: Fri, 7 Feb 2020 17:57:19 +0800
Subject: [PATCH] appDisplay: Call super.vfunc_unmap last

So as to guarantee the unmapped state sticks and doesn't get toggled
back to mapped before we return.

Being in a mapped state when `FolderIcon.vfunc_unmap()` returned was
causing an assertion failure in `clutter_actor_set_mapped` and crashed
the shell.

Closes: https://gitlab.gnome.org/GNOME/gnome-shell/issues/2170
---
 js/ui/appDisplay.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/js/ui/appDisplay.js b/js/ui/appDisplay.js
index 115285f32..77868722c 100644
--- a/js/ui/appDisplay.js
+++ b/js/ui/appDisplay.js
@@ -1525,10 +1525,10 @@ var FolderIcon = GObject.registerClass({
     }
 
     vfunc_unmap() {
-        super.vfunc_unmap();
-
         if (this._dialog)
             this._dialog.popdown();
+
+        super.vfunc_unmap();
     }
 
     open() {