[composer] Avoid hang when adding columns to table on Win (fix ##11462)

nyalldawson · nyalldawson · commit 5f9e45af49fe · 2014-10-22T19:39:02.000+11:00
diff --git a/src/app/composer/qgscomposerattributetablewidget.cpp b/src/app/composer/qgscomposerattributetablewidget.cpp
@@ -179,10 +179,15 @@ void QgsComposerAttributeTableWidget::on_mAttributesPushButton_clicked()
     composition->beginMultiFrameCommand( mComposerTable, tr( "Table attribute settings" ) );
   }
 
+  //temporarily block updates for the window, to stop table trying to repaint under windows (#11462)
+  window()->setUpdatesEnabled( false );
+
   QgsAttributeSelectionDialog d( mComposerTable, mComposerTable->sourceLayer(), 0 );
   if ( d.exec() == QDialog::Accepted )
   {
     mComposerTable->refreshAttributes();
+    //safe to unblock updates
+    window()->setUpdatesEnabled( true );
     mComposerTable->update();
     if ( composition )
     {
@@ -197,6 +202,7 @@ void QgsComposerAttributeTableWidget::on_mAttributesPushButton_clicked()
   {
     //undo changes
     mComposerTable->setColumns( currentColumns );
+    window()->setUpdatesEnabled( true );
     if ( composition )
     {
       composition->cancelMultiFrameCommand();

Original file line number	Diff line number	Diff line change
`@@ -179,10 +179,15 @@ void QgsComposerAttributeTableWidget::on_mAttributesPushButton_clicked()`
`179`	`179`	`composition->beginMultiFrameCommand( mComposerTable, tr( "Table attribute settings" ) );`
`180`	`180`	`}`
`181`	`181`
	`182`	`+ //temporarily block updates for the window, to stop table trying to repaint under windows (#11462)`
	`183`	`+ window()->setUpdatesEnabled( false );`
	`184`	`+`
`182`	`185`	`QgsAttributeSelectionDialog d( mComposerTable, mComposerTable->sourceLayer(), 0 );`
`183`	`186`	`if ( d.exec() == QDialog::Accepted )`
`184`	`187`	`{`
`185`	`188`	`mComposerTable->refreshAttributes();`
	`189`	`+ //safe to unblock updates`
	`190`	`+ window()->setUpdatesEnabled( true );`
`186`	`191`	`mComposerTable->update();`
`187`	`192`	`if ( composition )`
`188`	`193`	`{`
`@@ -197,6 +202,7 @@ void QgsComposerAttributeTableWidget::on_mAttributesPushButton_clicked()`
`197`	`202`	`{`
`198`	`203`	`//undo changes`
`199`	`204`	`mComposerTable->setColumns( currentColumns );`
	`205`	`+ window()->setUpdatesEnabled( true );`
`200`	`206`	`if ( composition )`
`201`	`207`	`{`
`202`	`208`	`composition->cancelMultiFrameCommand();`