another take on #5597

jef-n · jef-n · commit b600ff73572c · 2012-05-23T19:02:07.000+02:00
diff --git a/src/app/qgscustomization.cpp b/src/app/qgscustomization.cpp
@@ -35,6 +35,7 @@
 #include <QToolButton>
 #include <QStatusBar>
 #include <QMetaObject>
+#include <QThread>
 
 #ifdef Q_OS_MACX
 QgsCustomizationDialog::QgsCustomizationDialog( QWidget *parent )
@@ -856,8 +857,8 @@ void QgsCustomization::removeFromLayout( QLayout *theLayout, QWidget * theWidget
 
 void QgsCustomization::preNotify( QObject * receiver, QEvent * event, bool * done )
 {
-  // Crashes especially on Mac if the reciever is in another thread, see #5597
-  if ( QCoreApplication::instance()->thread() != receiver->thread() )
+  // Crashes especially on Mac if we're not in the main/UI thread, see #5597
+  if ( QCoreApplication::instance()->thread() != QThread::currentThread() )
   {
     return;
   }

Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,7 @@`
`35`	`35`	`#include <QToolButton>`
`36`	`36`	`#include <QStatusBar>`
`37`	`37`	`#include <QMetaObject>`
	`38`	`+#include <QThread>`
`38`	`39`
`39`	`40`	`#ifdef Q_OS_MACX`
`40`	`41`	`QgsCustomizationDialog::QgsCustomizationDialog( QWidget *parent )`
`@@ -856,8 +857,8 @@ void QgsCustomization::removeFromLayout( QLayout theLayout, QWidget theWidget`
`856`	`857`
`857`	`858`	`void QgsCustomization::preNotify( QObject * receiver, QEvent * event, bool * done )`
`858`	`859`	`{`
`859`		`- // Crashes especially on Mac if the reciever is in another thread, see #5597`
`860`		`- if ( QCoreApplication::instance()->thread() != receiver->thread() )`
	`860`	`+ // Crashes especially on Mac if we're not in the main/UI thread, see #5597`
	`861`	`+ if ( QCoreApplication::instance()->thread() != QThread::currentThread() )`
`861`	`862`	`{`
`862`	`863`	`return;`
`863`	`864`	`}`