[Cmake-commits] [cmake-commits] hoffman committed cmCursesMainForm.cxx 1.73 1.73.2.1

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source/CursesDialog
In directory public:/mounts/ram/cvs-serv25234/Source/CursesDialog

Modified Files:
      Tag: CMake-2-6
	cmCursesMainForm.cxx 
Log Message:
ENH: merge in changes for 2.6.3 RC 1


Index: cmCursesMainForm.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CursesDialog/cmCursesMainForm.cxx,v
retrieving revision 1.73
retrieving revision 1.73.2.1
diff -C 2 -d -r1.73 -r1.73.2.1
*** cmCursesMainForm.cxx	7 Mar 2008 21:32:09 -0000	1.73
--- cmCursesMainForm.cxx	24 Oct 2008 15:18:55 -0000	1.73.2.1
***************
*** 684,695 ****
        this->OkToGenerate = false;
        }
-     // reset error condition
-     cmSystemTools::ResetErrorOccuredFlag();
      int xx,yy;
      getmaxyx(stdscr, yy, xx);
      cmCursesLongMessageForm* msgs = new cmCursesLongMessageForm(
        this->Errors,
!       cmSystemTools::GetErrorOccuredFlag() ? "Errors occurred during the last pass." :
!                                              "CMake produced the following output.");
      CurrentForm = msgs;
      msgs->Render(1,1,xx,yy);
--- 684,696 ----
        this->OkToGenerate = false;
        }
      int xx,yy;
      getmaxyx(stdscr, yy, xx);
      cmCursesLongMessageForm* msgs = new cmCursesLongMessageForm(
        this->Errors,
!       cmSystemTools::GetErrorOccuredFlag()
!       ? "Errors occurred during the last pass." :
!       "CMake produced the following output.");
!     // reset error condition
!     cmSystemTools::ResetErrorOccuredFlag();
      CurrentForm = msgs;
      msgs->Render(1,1,xx,yy);