mirrors/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

shell: Set desktop-shell deathstamp at initial launch

Browse Source 
Timestamp 0 is a valid timestamp and we can't use that as an uninitialized
timestamp.
This commit is contained in:
Kristian Høgsberg 2012-01-17 11:07:42 -05:00
parent 57cd0ed916
commit f03a616c21
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/shell.c
View File

@ -1281,8 +1281,7 @@ desktop_shell_sigchld(struct weston_process *process, int status)
/* if desktop-shell dies more than 5 times in 30 seconds, give up */
time = weston_compositor_get_time();
if (shell->child.deathstamp == 0 ||
time - shell->child.deathstamp > 30000) {
if (time - shell->child.deathstamp > 30000) {
shell->child.deathstamp = time;
shell->child.deathcount = 0;
}
@ -1464,6 +1463,7 @@ shell_init(struct weston_compositor *ec)
shell, bind_screensaver) == NULL)
return -1;
shell->child.deathstamp = weston_compositor_get_time();
if (launch_desktop_shell_process(shell) != 0)
return -1;