diff --git a/[refs] b/[refs]
index 45ea288f9f37..e1bdbcd8612e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: db146f06ac0bbea63271b6c78f4341ee46843e10
+refs/heads/master: 2708bf3a30b7bfa02d60a3f03603b6b92d093f1a
diff --git a/trunk/tools/perf/ui/gtk/setup.c b/trunk/tools/perf/ui/gtk/setup.c
index ad40b3626fdb..ec1ee26b485a 100644
--- a/trunk/tools/perf/ui/gtk/setup.c
+++ b/trunk/tools/perf/ui/gtk/setup.c
@@ -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();
 }