check thread in customization, it should fix #5597

blazek · blazek · commit d77069d2b0e0 · 2012-05-23T18:24:02.000+02:00
diff --git a/src/app/qgscustomization.cpp b/src/app/qgscustomization.cpp
@@ -856,6 +856,11 @@ 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() )
+  {
+    return;
+  }
   if ( event->type() == QEvent::Show || event->type() == QEvent::MouseButtonPress )
   {
     QWidget *widget = qobject_cast<QWidget*>( receiver );

Original file line number	Diff line number	Diff line change
`@@ -856,6 +856,11 @@ void QgsCustomization::removeFromLayout( QLayout theLayout, QWidget theWidget`
`856`	`856`
`857`	`857`	`void QgsCustomization::preNotify( QObject * receiver, QEvent * event, bool * done )`
`858`	`858`	`{`
	`859`	`+ // Crashes especially on Mac if the reciever is in another thread, see #5597`
	`860`	`+ if ( QCoreApplication::instance()->thread() != receiver->thread() )`
	`861`	`+ {`
	`862`	`+ return;`
	`863`	`+ }`
`859`	`864`	`if ( event->type() == QEvent::Show \|\| event->type() == QEvent::MouseButtonPress )`
`860`	`865`	`{`
`861`	`866`	`QWidget widget = qobject_cast<QWidget>( receiver );`