Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev

1 files changed, 4 insertions, 6 deletions

diff --git a/src/plugins/platforms/cocoa/qnsview.mm b/src/plugins/platforms/cocoa/qnsview.mm
index 51c3953af1..b8a31329fe 100644
--- a/src/plugins/platforms/cocoa/qnsview.mm
+++ b/src/plugins/platforms/cocoa/qnsview.mm
@@ -107,12 +107,9 @@ static QTouchDevice *touchDevice = 0;
     m_maskImage = 0;
     m_maskData = 0;
     m_window = 0;
-    if (m_subscribesForGlobalFrameNotifications) {
-        m_subscribesForGlobalFrameNotifications = false;
-        [[NSNotificationCenter defaultCenter] removeObserver:self
-             name:NSViewGlobalFrameDidChangeNotification
-             object:self];
-}
+    m_subscribesForGlobalFrameNotifications = false;
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
+
     delete currentCustomDragTypes;
 
     [super dealloc];
@@ -603,6 +600,7 @@ static QTouchDevice *touchDevice = 0;
         QWindowSystemInterface::handleCloseEvent(m_platformWindow->m_activePopupWindow);
         QWindowSystemInterface::flushWindowSystemEvents();
         m_platformWindow->m_activePopupWindow = 0;
+        return;
     }
     if ([self hasMarkedText]) {
         NSInputManager* inputManager = [NSInputManager currentInputManager];