diff --git a/api/boinc_api.C b/api/boinc_api.C
index fb839cf3ae..a37f9fbc96 100644
--- a/api/boinc_api.C
+++ b/api/boinc_api.C
@@ -175,7 +175,7 @@ static bool update_app_progress(
) {
char msg_buf[MSG_CHANNEL_SIZE], buf[256];
- if (!app_client_shm) return false;
+ if (standalone) return true;
sprintf(msg_buf,
"%.15e\n"
diff --git a/checkin_notes b/checkin_notes
index c6ffa8f788..2b7888644a 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -8480,7 +8480,7 @@ David 24 June 2005
David 24 June 2005
- API library: potential bug:
if the core client sends a "quit" message that is handled
- (but the timer handler) while the worker thread is
+ (by the timer handler) while the worker thread is
in the middle of checkpointing,
the result could be an incomplete checkpoint,
which in general screws up the result.
@@ -8977,3 +8977,12 @@ Charlie 7 July 2005
mac-installer/
PostInstall.cpp
BOINC.pmproj
+
+David 7 July 2005
+ - Manager: fix for core client startup on Unix
+ (From Bernd Machenschalk)
+
+ api/
+ boinc_api.C
+ clientgui/
+ BOINCGUIApp.cpp
diff --git a/clientgui/BOINCGUIApp.cpp b/clientgui/BOINCGUIApp.cpp
index 01846d2347..2f11ecfa99 100644
--- a/clientgui/BOINCGUIApp.cpp
+++ b/clientgui/BOINCGUIApp.cpp
@@ -406,6 +406,11 @@ void CBOINCGUIApp::StartupBOINCCore() {
#else // ! __WXMAC__
+#ifndef __WXMSW__
+ // copy the path to the boinmgr from argv[0]
+ strncpy(szExecutableDirectory, wxGetApp().argv[0], sizeof(szExecutableDirectory));
+#endif
+
// We are only interested in the path component of the fully qualified path.
wxFileName::SplitPath(szExecutableDirectory, &strDirectory, NULL, NULL);
@@ -453,7 +458,7 @@ void CBOINCGUIApp::StartupBOINCCore() {
#ifndef __WXMAC__
// Append boinc.exe to the end of the strExecute string and get ready to rock
- strExecute += wxT("boinc");
+ strExecute += wxT("boinc -redirectio");
#endif // ! __WXMAC__
diff --git a/doc/contact.php b/doc/contact.php
index 6d4d68ab77..b2ab4e6720 100644
--- a/doc/contact.php
+++ b/doc/contact.php
@@ -80,6 +80,7 @@ show_name("Kenichi Miyoshi");
show_name("Tony Murray");
show_name("Eric Myers");
show_name("Kjell Nedrelid");
+show_name("Rob Ogilvie");
show_name("J.R. Oldroyd");
show_name("Jakob Pedersen");
show_name("Stephen Pellicer");
diff --git a/doc/index.php b/doc/index.php
index e74430b997..842f6554c1 100644
--- a/doc/index.php
+++ b/doc/index.php
@@ -86,6 +86,14 @@ computer resources
Resources |
+
- Wikis (user-editable information and documentation):
@@ -146,6 +154,7 @@ echo "
|
+
";
copyright();
diff --git a/doc/participate.php b/doc/participate.php
index 21668f4b63..830119f75d 100644
--- a/doc/participate.php
+++ b/doc/participate.php
@@ -2,7 +2,7 @@
require_once("docutil.php");
page_head("Participating in BOINC projects");
echo "
-Running BOINC
+Running BOINC
Preferences
@@ -31,7 +31,7 @@ echo "
Account managers
-Add-on software
+
Add-on software
-Statistics web sites
+
Statistics web sites
- BOINC statistics sites
- Downloading statistics data
diff --git a/doc/screensaver.php b/doc/screensaver.php
index dd4b04e2ba..2b6928652a 100644
--- a/doc/screensaver.php
+++ b/doc/screensaver.php
@@ -2,7 +2,13 @@
require_once("docutil.php");
page_head("The BOINC screensaver");
echo "
-The BOINC client software includes a screensaver program.
+The BOINC client software on Windows and Mac OS X includes a screensaver program,
+which you can select as your screensaver
+(on Windows, right-click on the desktop,
+click Properties, select Screen Saver, select BOINC).
+
+NOTE: BOINC runs even if you don't use the screensaver.
+
When active, the screensaver does the following: