]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
perf ui gtk: Ensure not to call gtk_main_quit() twice
authorNamhyung Kim <namhyung@kernel.org>
Fri, 17 Aug 2012 16:56:23 +0000 (01:56 +0900)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Mon, 20 Aug 2012 12:29:12 +0000 (09:29 -0300)
Currently the gtk_main_quit() is called twice when perf exits so the
following warning is emitted:

  [penberg@tux perf]$ ./perf report --gtk
  ^Cperf: Interrupt

  (perf:4048): Gtk-CRITICAL **: IA__gtk_main_quit: assertion `main_loops != NULL' failed

Fix it by not to call it unnecessarily.

Reported-by: Pekka Enberg <penberg@kernel.org>
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Acked-by: Pekka Enberg <penberg@kernel.org>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Pekka Enberg <penberg@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/1345222583-3964-1-git-send-email-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
tools/perf/ui/gtk/setup.c

index ad40b3626fdb9362ee231b847de7cf53990c6f3e..ec1ee26b485a1491f4ce47737072fb325adbad30 100644 (file)
@@ -13,6 +13,8 @@ int perf_gtk__init(void)
 
 void perf_gtk__exit(bool wait_for_ok __used)
 {
+       if (!perf_gtk__is_active_context(pgctx))
+               return;
        perf_error__unregister(&perf_gtk_eops);
        gtk_main_quit();
 }