Skip to content
Permalink
Browse files

another take on #5597

  • Loading branch information
jef-n committed May 23, 2012
1 parent f998a44 commit b600ff73572cae30d5bd245eae0b6fa7c36d9b1c
Showing with 3 additions and 2 deletions.
  1. +3 −2 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;
}

0 comments on commit b600ff7

Please sign in to comment.
You can’t perform that action at this time.