Skip to content
Permalink
Browse files
fix qgis-server crash moving QCursor to the GUI classes (follow 454c732)
  • Loading branch information
brushtyler committed Nov 27, 2012
1 parent 4a44daa commit 28e210b7a8b42c6f2cfd7a6961eb1dbf5e29d612
Showing with 9 additions and 2 deletions.
  1. +0 −2 src/core/symbology-ng/qgssvgcache.cpp
  2. +9 −0 src/gui/symbology-ng/qgssymbollayerv2widget.cpp
@@ -265,12 +265,10 @@ QByteArray QgsSvgCache::getImageData( const QString &path ) const

// wait until the image download finished
// TODO: connect to the reply->finished() signal
QApplication::setOverrideCursor( QCursor( Qt::WaitCursor ) );
while ( !reply->isFinished() )
{
QCoreApplication::processEvents( QEventLoop::ExcludeUserInputEvents, 500 );
}
QApplication::restoreOverrideCursor();

if ( reply->error() != QNetworkReply::NoError )
{
@@ -33,6 +33,7 @@

#include <QAbstractButton>
#include <QColorDialog>
#include <QCursor>
#include <QDir>
#include <QFileDialog>
#include <QPainter>
@@ -801,7 +802,11 @@ void QgsSvgMarkerSymbolLayerV2Widget::on_mFileLineEdit_editingFinished()
return;
}
}

QApplication::setOverrideCursor( QCursor( Qt::WaitCursor ) );
mLayer->setPath( mFileLineEdit->text() );
QApplication::restoreOverrideCursor();

setGuiForSvg( mLayer );
emit changed();
}
@@ -994,7 +999,11 @@ void QgsSVGFillSymbolLayerWidget::on_mSVGLineEdit_editingFinished()
return;
}
}

QApplication::setOverrideCursor( QCursor( Qt::WaitCursor ) );
mLayer->setSvgFilePath( mSVGLineEdit->text() );
QApplication::restoreOverrideCursor();

updateParamGui();
emit changed();
}

0 comments on commit 28e210b

Please sign in to comment.