no hang on open device patch

git-svn-id: https://recordmydesktop.svn.sourceforge.net/svnroot/recordmydesktop/trunk@113 f606c939-3180-4ac9-a4b8-4b8779d57d0a

1 files changed, 10 insertions, 4 deletions

diff --git a/rMD-exp/src/recordmydesktop.c b/rMD-exp/src/recordmydesktop.c
index 15292f9..c14f605 100644
--- a/rMD-exp/src/recordmydesktop.c
+++ b/rMD-exp/src/recordmydesktop.c
@@ -30,7 +30,7 @@
 
 int main(int argc,char **argv){
     ProgData pdata;
-
+    int exit_status=0;
     if(XInitThreads ()==0){
         fprintf(stderr,"Couldn't initialize thread support!\n");
         exit(7);
@@ -198,9 +198,15 @@ int main(int argc,char **argv){
 //         pthread_join(image_encode_t,NULL);
         fprintf(stderr,".");
         if(!pdata.args.nosound){
-            pthread_join(sound_capture_t,NULL);
+            int *snd_exit;
+            pthread_join(sound_capture_t,(&snd_exit));
             fprintf(stderr,".");
-//             pthread_join(sound_encode_t,NULL);
+//             if(!(*snd_exit))
+//                 pthread_join(sound_encode_t,NULL);
+//             else{
+//                 pthread_cancel(sound_encode_t);
+//                 exit_status=*snd_exit;
+//             }
             fprintf(stderr,".");
         }
         else
@@ -230,7 +236,7 @@ int main(int argc,char **argv){
         else
             fprintf(stderr,"Goodbye!\n");
     }
-    return 0;
+    return exit_status;
 }