[gimp/gimp-2-10] do not activate OSX menu if tests are running to prevent crash



commit 62c52742cd8d6de3c60f3381e6913939b31cd4d7
Author: Alex Samorukov <samm os2 kiev ua>
Date:   Fri Nov 23 11:39:21 2018 +0100

    do not activate OSX menu if tests are running to prevent crash

 app/gui/gui.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/app/gui/gui.c b/app/gui/gui.c
index ec35071b04..ce7a3609cb 100644
--- a/app/gui/gui.c
+++ b/app/gui/gui.c
@@ -640,7 +640,10 @@ gui_restore_after_callback (Gimp               *gimp,
     if (GTK_IS_MENU_ITEM (menu))
       menu = gtk_menu_item_get_submenu (GTK_MENU_ITEM (menu));
 
-    gtkosx_application_set_menu_bar (osx_app, GTK_MENU_SHELL (menu));
+    /* do not activate OSX menu if tests are running */
+    if (!getenv("GIMP_TESTING_ABS_TOP_SRCDIR"))
+      gtkosx_application_set_menu_bar (osx_app, GTK_MENU_SHELL (menu));
+
     gtkosx_application_set_use_quartz_accelerators (osx_app, FALSE);
 
     gui_add_to_app_menu (image_ui_manager, osx_app,


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]