Messages in this thread | | | From | Namhyung Kim <> | Subject | Re: [PATCH] perf ui/gtk: Ensure not to call gtk_main_quit() twice | Date | Mon, 20 Aug 2012 10:55:24 +0900 |
| |
On Mon, 20 Aug 2012 10:50:21 +0900, Namhyung Kim wrote: > On Sat, 18 Aug 2012 10:52:03 +0300, Pekka Enberg wrote: >> Wouldn't it be nicer to rearrange the callers so that perf_gtk__exit() >> is not called twice? > > You mean this? > > > diff --git a/tools/perf/ui/setup.c b/tools/perf/ui/setup.c > index c7820e569660..d25e145e9a89 100644 > --- a/tools/perf/ui/setup.c > +++ b/tools/perf/ui/setup.c > @@ -2,6 +2,7 @@ > > #include "../cache.h" > #include "../debug.h" > +#include "gtk/gtk.h"
Oops, it should be
#ifndef NO_GTK2_SUPPORT # include "gtk/gtk.h" #endif
Thanks, Namhyung
> > > pthread_mutex_t ui__lock = PTHREAD_MUTEX_INITIALIZER; > @@ -37,7 +38,8 @@ void exit_browser(bool wait_for_ok) > { > switch (use_browser) { > case 2: > - perf_gtk__exit(wait_for_ok); > + if (perf_gtk__is_active_context(pgctx)) > + perf_gtk__exit(wait_for_ok); > break; > > case 1:
| |