From 8d1af7892f58678b03e7391a7cbfa640fe1905fa Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Thu, 12 Jan 2012 00:27:21 +0000
Subject: [PATCH] - API: respect direct_process_action even if multi_process is
 set

svn path=/trunk/boinc/; revision=25031
---
 api/boinc_api.cpp | 2 +-
 checkin_notes     | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/api/boinc_api.cpp b/api/boinc_api.cpp
index 5346b15372..77a5ca54ab 100644
--- a/api/boinc_api.cpp
+++ b/api/boinc_api.cpp
@@ -819,7 +819,7 @@ int suspend_activities() {
         }
     }
 #else
-    if (options.multi_process) {
+    if (options.multi_process && options.direct_process_action) {
         suspend_or_resume_descendants(0, false);
     }
 #endif
diff --git a/checkin_notes b/checkin_notes
index 57f1fe9c58..3721410f37 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -376,3 +376,9 @@ David  11 Jan 2012
         vbox.cpp,h
         floppyio.cpp,h
         vboxwrapper.cpp
+
+David  11 Jan 2012
+    - API: respect direct_process_action even if multi_process is set
+
+    api/
+        boinc_api.cpp