On Sat, Jun 09, 2012 at 03:10:28PM +0200, Rafal Mielniczuk wrote:
> In case XDG_RUNTIME_DIR was not set, weston_log
> will crash the compositor instead of spitting
> error msg, as weston log was not yet opened

Ah, yes, not good.  Committed.
Kristian

> ---
>  src/compositor.c |    4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/src/compositor.c b/src/compositor.c
> index 700f31b..0230de8 100644
> --- a/src/compositor.c
> +++ b/src/compositor.c
> @@ -3162,13 +3162,13 @@ int main(int argc, char *argv[])
>       argc = parse_options(core_options,
>                            ARRAY_LENGTH(core_options), argc, argv);
>  
> +     weston_log_file_open(log);
> +     
>       if (!getenv("XDG_RUNTIME_DIR")) {
>               weston_log(xdg_error_message);
>               exit(EXIT_FAILURE);
>       }
>  
> -     weston_log_file_open(log);
> -
>       gettimeofday(&tv, NULL);
>       brokendown_time = localtime(&tv.tv_sec);
>       strftime(buffer, sizeof buffer, "%Y-%m-%d %H:%M:%S", brokendown_time);
> -- 
> 1.7.10.4
> 
_______________________________________________
wayland-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/wayland-devel

Reply via email to