diff --git a/checkin_notes b/checkin_notes index b9645947fb..71049fff9a 100755 --- a/checkin_notes +++ b/checkin_notes @@ -7312,14 +7312,14 @@ David 16 July 2007 client_state.C,h David 16 July 2007 - - Manager: changed wording the "Choose a project" page - of attach wizard. - At least one person was confused by 'WWW'; - he thought you clicked there to choose project. + - Manager: changed wording the "Choose a project" page + of attach wizard. + At least one person was confused by 'WWW'; + he thought you clicked there to choose project. - clientgui/ - ProjectInfoPage.cpp - ProjectListCtrl.cpp + clientgui/ + ProjectInfoPage.cpp + ProjectListCtrl.cpp Charlie 17 July 2007 @@ -7521,3 +7521,15 @@ David 25 July 2007 team_import.php user/ repair.php (deleted) + +David 27 July 2007 + - client: fix bug that caused "no shared memory segment" errors, + introduced in 20 July checkin + + client/ + app_control.C + clientgui/ + ProjectInfoPage.cpp + ViewWork.cpp + ViewWorkGrid.cpp + diff --git a/client/app_control.C b/client/app_control.C index 06300c87fe..ce61698c76 100644 --- a/client/app_control.C +++ b/client/app_control.C @@ -198,6 +198,7 @@ void ACTIVE_TASK::handle_exit_zero(bool& will_restart) { // did we send it a quit message? // if (task_state() == PROCESS_QUIT_PENDING) { + set_task_state(PROCESS_UNINITIALIZED, "handle_exited_app"); will_restart = true; return; } diff --git a/clientgui/ProjectInfoPage.cpp b/clientgui/ProjectInfoPage.cpp index bf5e902e20..1fdc1771af 100644 --- a/clientgui/ProjectInfoPage.cpp +++ b/clientgui/ProjectInfoPage.cpp @@ -244,7 +244,7 @@ void CProjectInfoPage::OnPageChanged( wxWizardExEvent& event ) { m_pDescriptionStaticCtrl->SetLabel( _("To choose a project, click its name\n" "or type its URL below.\n" - "Click on 'www' to visit a project's web site." + "Click 'www' to visit a project's web site." ) ); m_pProjectUrlStaticCtrl->SetLabel( diff --git a/clientgui/ViewWork.cpp b/clientgui/ViewWork.cpp index 0830f9d7b9..aee4b474e0 100644 --- a/clientgui/ViewWork.cpp +++ b/clientgui/ViewWork.cpp @@ -801,6 +801,12 @@ wxInt32 CViewWork::FormatStatus(wxInt32 item, wxString& strBuffer) const { } else { strBuffer = _("Running"); } +#if 0 + // doesn't work - result pointer not there + if (result->project->non_cpu_intensive) { + strBuffer += _(" (non-CPU-intensive)"); + } +#endif } else if (result->scheduler_state == CPU_SCHED_PREEMPTED) { strBuffer = _("Waiting to run"); } else if (result->scheduler_state == CPU_SCHED_UNINITIALIZED) { diff --git a/clientgui/ViewWorkGrid.cpp b/clientgui/ViewWorkGrid.cpp index 70d9799724..fb2fc4f93d 100644 --- a/clientgui/ViewWorkGrid.cpp +++ b/clientgui/ViewWorkGrid.cpp @@ -728,6 +728,12 @@ wxInt32 CViewWorkGrid::FormatStatus(wxInt32 item, wxString& strBuffer) const { } else { strBuffer = _("Running"); } +#if 0 + // doesn't work - result pointer not there + if (result->project->non_cpu_intensive) { + strBuffer += _(" (non-CPU-intensive)"); + } +#endif } else if (result->scheduler_state == CPU_SCHED_PREEMPTED) { strBuffer = _("Waiting to run"); } else if (result->scheduler_state == CPU_SCHED_UNINITIALIZED) {