- client: fix bug that caused "no shared memory segment" errors,

introduced in 20 July checkin

svn path=/trunk/boinc/; revision=13230
This commit is contained in:
David Anderson 2007-07-27 18:22:52 +00:00
parent 593457f733
commit 803152369a
5 changed files with 33 additions and 8 deletions

View File

@ -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

View File

@ -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;
}

View File

@ -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(

View File

@ -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) {

View File

@ -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) {