diff options
| author | schneefux <schneefux+commit@schneefux.xyz> | 2014-07-03 15:20:45 +0000 |
|---|---|---|
| committer | schneefux <schneefux+commit@schneefux.xyz> | 2014-07-03 15:20:45 +0000 |
| commit | 58a6dea66f23859f58ad1d6a543ac18e15882fab (patch) | |
| tree | f7daf3c4286c2fa90c8967a41cdb51ffa2bec85c | |
| parent | 7cc7ba87cd2166d618381f3d85f1e861a3c82f0d (diff) | |
| parent | a2c3e554b4897b4e386dd4b9682af2f9117afb9b (diff) | |
| download | graynard-58a6dea66f23859f58ad1d6a543ac18e15882fab.tar.gz graynard-58a6dea66f23859f58ad1d6a543ac18e15882fab.zip | |
Merge remote-tracking branch 'upstream/master'
merge upstream
| -rw-r--r-- | AUTHORS | 6 | ||||
| -rw-r--r-- | shell/maynard.c | 7 |
2 files changed, 11 insertions, 2 deletions
@@ -1,4 +1,8 @@ Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk> Jonny Lamb <jonny.lamb@collabora.co.uk> Marco Barisione <marco.barisione@collabora.co.uk> -Tiago Vignatti <tiago.vignatti@intel.com> + +Tiago Vignatti <tiago.vignatti@intel.com> is the author of + weston-gtk-shell, the original base for maynard, but did not take + part in maynard's development. Please don't bother him about maynard + specific queries! diff --git a/shell/maynard.c b/shell/maynard.c index 0baf750..1939e34 100644 --- a/shell/maynard.c +++ b/shell/maynard.c @@ -331,8 +331,13 @@ main (int argc, /* Wait until we have been notified about the compositor, * shell, and shell helper objects */ - while (!desktop->output || !desktop->shell || !desktop->helper) + if (!desktop->output || !desktop->shell || !desktop->helper) wl_display_roundtrip (desktop->display); + if (!desktop->output || !desktop->shell || !desktop->helper) + { + fprintf (stderr, "could not find output, shell or helper modules\n"); + return -1; + } css_setup (desktop); background_create (desktop); |