[pkg-fso-commits] [SCM] Automatic Display Manager branch, master, updated. debian/0.8-1-21-g3ad8f4d

[Enrico Zini]

The following commit has been merged in the master branch:
commit 3ad8f4da7dd5dcfe3097ea94dfd91acc69385dcc
Author: Enrico Zini <enrico at enricozini.org>
Date:   Sat Jul 9 11:20:45 2011 +0100

    Reenabled restart previously disabled during testing and getting committed by mistake

diff --git a/dm.c b/dm.c
index 59d43d0..119db29 100644
--- a/dm.c
+++ b/dm.c
@@ -373,7 +373,7 @@ static int interruptible_sleep(int seconds)
 
 int nodm_display_manager_wait_restart_loop(struct nodm_display_manager* dm)
 {
-    static int retry_times[] = { -1, 0, 0, 30, 30, 60, 60, -1 };
+    static int retry_times[] = { 0, 0, 30, 30, 60, 60, -1 };
     int restart_count = 0;
     int res;
 
@@ -394,8 +394,6 @@ int nodm_display_manager_wait_restart_loop(struct nodm_display_manager* dm)
                 return res;
         }
 
-        return res;
-
         /* Check if the session was too short */
         if (end - dm->last_session_start < dm->conf_minimum_session_time)
         {

-- 
Automatic Display Manager