QPA: fix spontaneous deadlock when closing windows

Author: threedeyes

platforms/qhaikuplatform/haiku/qhaikuwindow.cpp

@@ -199,6 +199,18 @@ void QtHaikuWindow::MessageReceived(BMessage* msg)
 		return;
 	}
 	switch(msg->what) {
+		case kCloseWindow:
+		{
+			Quit();
+			return;
+		}
+		case kSetTitle:
+		{
+			const char *title = msg->FindString("title");
+			if (title != NULL)
+				SetTitle(title);
+			return;
+		}
 		case kQuitApplication:
 		{
 			be_app->PostMessage(B_QUIT_REQUESTED);
@@ -295,7 +307,7 @@ QHaikuWindow::QHaikuWindow(QWindow *wnd)
     , m_visible(false)
     , m_pendingGeometryChangeOnShow(true)
 {
-	connect(m_window, SIGNAL(quitRequested()), SLOT(platformWindowQuitRequested()), Qt::BlockingQueuedConnection);
+	connect(m_window, SIGNAL(quitRequested()), SLOT(platformWindowQuitRequested()));
     connect(m_window, SIGNAL(windowMoved(QPoint)), SLOT(platformWindowMoved(QPoint)));
 	connect(m_window, SIGNAL(windowResized(QSize)), SLOT(platformWindowResized(QSize)));
     connect(m_window, SIGNAL(windowActivated(bool)), SLOT(platformWindowActivated(bool)));
@@ -331,10 +343,10 @@ QHaikuWindow::QHaikuWindow(QWindow *wnd)
 }
 
 
-QHaikuWindow::~QHaikuWindow()
+void QHaikuWindow::destroy()
 {
-	m_window->Lock();
-	m_window->Quit();
+	m_window->PostMessage(kCloseWindow);
+	m_window = NULL;
 }
 
 
@@ -450,7 +462,9 @@ void QHaikuWindow::setWindowTitle(const QString &title)
 {
 	QString newTitle = QPlatformWindow::formatWindowTitle(title, QStringLiteral(" - "));
 	newTitle = QPlatformTheme::removeMnemonics(newTitle).trimmed();
-	m_window->SetTitle(newTitle.toUtf8().constData());
+	BMessage message(kSetTitle);
+	message.AddString("title", newTitle.toUtf8().constData());
+	m_window->PostMessage(&message);
 }
 
 
@@ -568,8 +582,6 @@ void QHaikuWindow::setVisible(bool visible)
 	if (visible == m_visible)
 		return;
 
-	m_window->Lock();
-
 	if (visible) {
 		if (window()->type() == Qt::Popup) {
 			m_window->SetWorkspaces(B_CURRENT_WORKSPACE);
@@ -584,7 +596,6 @@ void QHaikuWindow::setVisible(bool visible)
 		setWindowFlags(window()->flags());
 		m_window->Hide();
     }
-    m_window->Unlock();
 
 	if (visible) {
 		if (window()->type() != Qt::ToolTip)

platforms/qhaikuplatform/haiku/qhaikuwindow.h

@@ -1,7 +1,7 @@
 /****************************************************************************
 **
 ** Copyright (C) 2017 The Qt Company Ltd.
-** Copyright (C) 2015-2017 Gerasim Troeglazov,
+** Copyright (C) 2015-2020 Gerasim Troeglazov,
 ** Contact: 3dEyes@gmail.com
 **
 ** This file is part of the plugins of the Qt Toolkit.
@@ -65,6 +65,8 @@
 #define kQuitApplication	'QAPP'
 #define kSizeGripEnable		'SGEN'
 #define kSizeGripDisable	'SGDI'
+#define kSetTitle			'TITL'
+#define kCloseWindow		'CLWN'
 
 QT_BEGIN_NAMESPACE
 
@@ -119,7 +121,9 @@ class QHaikuWindow : public QObject, public QPlatformWindow
 	Q_OBJECT
 public:
 	QHaikuWindow(QWindow *window);
-	~QHaikuWindow();
+	~QHaikuWindow() {};
+
+	virtual void destroy();
 
 	void setGeometry(const QRect &rect) override;
 	void setWindowTitle(const QString &title) override;