Fixes: NB#182237 - Closing a hung application with the decorator doesn't kill the process

Details: Workaround for MWindow regression where pressing close button immediate quits that window
RevBy: TrustMe

2 files changed, 9 insertions, 0 deletions

diff --git a/decorators/mdecorator/mdecoratorwindow.cpp b/decorators/mdecorator/mdecoratorwindow.cpp
index cfe0ebc..92347a0 100644
--- a/decorators/mdecorator/mdecoratorwindow.cpp
+++ b/decorators/mdecorator/mdecoratorwindow.cpp
@@ -314,4 +314,10 @@ const QRect MDecoratorWindow::availableClientRect() const
     return decoratorRect;
 }
 
+void MDecoratorWindow::closeEvent(QCloseEvent * event )
+{
+    // never close the decorator!
+    return event->ignore();
+}
+
 #include "mdecoratorwindow.moc"
diff --git a/decorators/mdecorator/mdecoratorwindow.h b/decorators/mdecorator/mdecoratorwindow.h
index 6545e88..b17b1d9 100644
--- a/decorators/mdecorator/mdecoratorwindow.h
+++ b/decorators/mdecorator/mdecoratorwindow.h
@@ -57,6 +57,9 @@ public:
      */
     void setInputRegion();
 
+protected:
+    virtual void closeEvent(QCloseEvent * event );
+
 private slots:
 
     void screenRotated(const M::Orientation &orientation);