[Commit-gnuradio] r4420 - gnuradio/branches/releases/3.0/gnuradio-core/src/lib/runtime

[jcorgan]

Author: jcorgan
Date: 2007-02-07 12:23:11 -0700 (Wed, 07 Feb 2007)
New Revision: 4420

Modified:
   
gnuradio/branches/releases/3.0/gnuradio-core/src/lib/runtime/gr_vmcircbuf_sysv_shm.cc
Log:
Applied changeset r4346 on trunk to release branch.

Modified: 
gnuradio/branches/releases/3.0/gnuradio-core/src/lib/runtime/gr_vmcircbuf_sysv_shm.cc
===================================================================
--- 
gnuradio/branches/releases/3.0/gnuradio-core/src/lib/runtime/gr_vmcircbuf_sysv_shm.cc
       2007-02-07 19:15:17 UTC (rev 4419)
+++ 
gnuradio/branches/releases/3.0/gnuradio-core/src/lib/runtime/gr_vmcircbuf_sysv_shm.cc
       2007-02-07 19:23:11 UTC (rev 4420)
@@ -68,11 +68,13 @@
 
   if ((shmid2 = shmget (IPC_PRIVATE, 2 * size + 2 * pagesize, IPC_CREAT | 
0700)) == -1){
     perror ("gr_vmcircbuf_sysv_shm: shmget (1)");
+    shmctl (shmid_guard, IPC_RMID, 0);
     throw std::runtime_error ("gr_vmcircbuf_sysv_shm");
   }
 
   if ((shmid1 = shmget (IPC_PRIVATE, size, IPC_CREAT | 0700)) == -1){
     perror ("gr_vmcircbuf_sysv_shm: shmget (2)");
+    shmctl (shmid_guard, IPC_RMID, 0);
     shmctl (shmid2, IPC_RMID, 0);
     throw std::runtime_error ("gr_vmcircbuf_sysv_shm");
   }