From: vsr <vsr@opencascade.com>
Date: Mon, 28 Feb 2005 14:59:17 +0000 (+0000)
Subject: PAL8026 (fix previous integration which caused another bug)
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=60cec2e790d7f660bc009dd8ad40d9d6aed0f946;p=modules%2Fkernel.git

PAL8026 (fix previous integration which caused another bug)
---

diff --git a/src/SALOMEGUI/QAD_Desktop.cxx b/src/SALOMEGUI/QAD_Desktop.cxx
index 1f15d0236..aaad78ca6 100644
--- a/src/SALOMEGUI/QAD_Desktop.cxx
+++ b/src/SALOMEGUI/QAD_Desktop.cxx
@@ -3062,7 +3062,6 @@ void QAD_Desktop::onComboActiveComponent( const QString & component ){
 }
 void QAD_Desktop::onComboActiveComponent( const QString & component, bool isLoadData)
 {
-  QAD_WaitCursor wc;
   if (myActiveStudy != 0) {
     if (myActiveComp.compare(component)!=0) {
       // deactivate previous component
@@ -3076,6 +3075,10 @@ void QAD_Desktop::onComboActiveComponent( const QString & component, bool isLoad
 //	QApplication::setOverrideCursor( Qt::waitCursor );
 	bool isOk = ( !isLoadData || loadComponentData( getComponentName(component) ) );
 	if ( !isOk ) {
+	  // It is only to remove Wait cursor set outside of this method
+	  // QAD_WaitCursor has recursive behaviour
+	  // This is PAL8026 fix
+	  QAD_WaitCursor wc;
 	  wc.stop();
 	  QAD_MessageBox::error1( this, 
 				 tr("ERR_ERROR"),