1 files changed, 4 insertions, 3 deletions

diff --git a/src/firejail/join.c b/src/firejail/join.c
index 1494c782f..531f8c06a 100644
--- a/src/firejail/join.c
+++ b/src/firejail/join.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
  *
  * This file is part of firejail project
  *
@@ -322,8 +322,8 @@ bool is_ready_for_join(const pid_t pid) {
 void check_join_permission(pid_t pid) {
         // check if pid belongs to a fully set up firejail sandbox
         unsigned long i;
-        for (i = 0; is_ready_for_join(pid) == false; i += SNOOZE) { // give sandbox some time to start up
-                if (i >= join_timeout) {
+        for (i = SNOOZE; is_ready_for_join(pid) == false; i += SNOOZE) { // give sandbox some time to start up
+                if (i > join_timeout) {
                         fprintf(stderr, "Error: no valid sandbox\n");
                         exit(1);
                 }
@@ -531,6 +531,7 @@ void join(pid_t pid, int argc, char **argv, int index) {
 
                 // it will never get here!!!
         }
+        EUID_USER();
 
         int status = 0;
         //*****************************