1 files changed, 7 insertions, 2 deletions
diff --git a/test/test.c b/test/test.c
index 8de4c1504..d596b87ab 100644
--- a/test/test.c
+++ b/test/test.c
@@ -27,11 +27,16 @@ test_init (int *argc,
 		 NULL);
 }
 
-void
+int
 test_quit (int exit_code)
 {
 	gnome_vfs_shutdown ();
-	gtk_main_quit ();
+
+	if (gtk_main_level () > 0) {
+		gtk_main_quit ();
+	}
+
+	return exit_code;
 }
 
 void