From 153502e60ab0e73443a211578e448a066cd1d737 Mon Sep 17 00:00:00 2001
From: Charlie Fenton <charlief@example.com>
Date: Fri, 5 Oct 2007 10:38:01 +0000
Subject: [PATCH] CC: Fix crash bug: set app_client_shm.shm = NULL after
 calling detach_shmem_mmap.

svn path=/trunk/boinc/; revision=13779
---
 checkin_notes | 9 ++++++++-
 client/app.C  | 4 ++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index 0567e3ed28..51bf3735a2 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -9164,8 +9164,15 @@ David  4 Oct 2007
         sched_locality.C
         sched_send.C,h
 
-Charlie 3 Oct 2007
+Charlie 4 Oct 2007
     - API V6 GFX: Initialize boinc_max_fps = 30.
 
     api/
         graphics2.C
+
+Charlie 5 Oct 2007
+    - CC: Fix crash bug: set app_client_shm.shm = NULL after calling 
+        detach_shmem_mmap.
+        
+    client/
+        app.C
diff --git a/client/app.C b/client/app.C
index 7d4ef099a2..51fef35597 100644
--- a/client/app.C
+++ b/client/app.C
@@ -200,9 +200,9 @@ void ACTIVE_TASK::cleanup_task() {
                     "Couldn't destroy shared memory: %s", boincerror(retval)
                 );
             }
-            app_client_shm.shm = NULL;
-            gstate.retry_shmem_time = 0;
         }
+        app_client_shm.shm = NULL;
+        gstate.retry_shmem_time = 0;
     }
     
     if (gstate.exit_after_finish) {