[cmake-commits] clinton committed CMakeSetupDialog.cxx 1.20 1.21

cmake-commits at cmake.org cmake-commits at cmake.org
Mon Nov 12 17:51:25 EST 2007


Update of /cvsroot/CMake/CMake/Source/QtDialog
In directory public:/mounts/ram/cvs-serv798

Modified Files:
	CMakeSetupDialog.cxx 
Log Message:
BUG:  Fix prompt for changes if they haven't been saved.


Index: CMakeSetupDialog.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/QtDialog/CMakeSetupDialog.cxx,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- CMakeSetupDialog.cxx	12 Nov 2007 22:41:15 -0000	1.20
+++ CMakeSetupDialog.cxx	12 Nov 2007 22:51:23 -0000	1.21
@@ -689,19 +689,12 @@
     return;
     }
 
-  CMakeSetupDialog::State old = this->CurrentState;
   this->CurrentState = s;
 
   if(s == Interrupting)
     {
-    if(old == Configuring)
-      {
-      this->ConfigureButton->setEnabled(false);
-      }
-    if(old == Generating)
-      {
-      this->GenerateButton->setEnabled(false);
-      }
+    this->ConfigureButton->setEnabled(false);
+    this->GenerateButton->setEnabled(false);
     }
   else if(s == Configuring)
     {
@@ -713,6 +706,7 @@
     }
   else if(s == Generating)
     {
+    this->CacheModified = false;
     this->Output->clear();
     this->setEnabledState(false);
     this->ConfigureButton->setEnabled(false);



More information about the Cmake-commits mailing list