X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?p=pintos-anon;a=blobdiff_plain;f=src%2Fthreads%2Finit.c;h=855afa0340fcb66788aa03a00cc70666b17bbbae;hp=26b9345879c1848ce1d7321ea6e68160854e022f;hb=3fb471cc28899036990751f18e2ccb83bf897411;hpb=4fbba40cd34402c014c66576490455c58856b51a

diff --git a/src/threads/init.c b/src/threads/init.c
index 26b9345..855afa0 100644
--- a/src/threads/init.c
+++ b/src/threads/init.c
@@ -112,8 +112,13 @@ main (void)
   /* Run a user program. */
   if (initial_program != NULL)
     {
+      tid_t tid;
       printf ("\nExecuting '%s':\n", initial_program);
-      process_execute (initial_program); 
+      tid = process_execute (initial_program);
+#ifdef THREAD_JOIN_IMPLEMENTED
+      if (tid != TID_ERROR)
+        thread_join (tid);
+#endif
     }
 #else
   test ();