another take on #5597

qgis · May 23, 2012 · b600ff7 · b600ff7
1 parent f998a44
commit b600ff7
Showing 1 changed file with 3 additions and 2 deletions.
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;
   }