From cb8e6c65f95bf7495fac9c467e7d884a28bec995 Mon Sep 17 00:00:00 2001 From: Jonas Danielsson Date: Thu, 13 Jun 2013 08:03:21 +0200 Subject: [PATCH] stlink-gui: add check for existence of UI file --- gui/stlink-gui.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/gui/stlink-gui.c b/gui/stlink-gui.c index 756d766..fde1d34 100644 --- a/gui/stlink-gui.c +++ b/gui/stlink-gui.c @@ -798,10 +798,15 @@ stlink_gui_build_ui (STlinkGUI *gui) { GtkBuilder *builder; GtkListStore *devmem_store; GtkListStore *filemem_store; + gchar *ui_file = STLINK_UI_DIR "/stlink-gui.ui"; + if (!g_file_test (ui_file, G_FILE_TEST_EXISTS)) { + ui_file = "stlink-gui.ui"; + } builder = gtk_builder_new (); - if (!gtk_builder_add_from_file (builder, STLINK_UI_DIR "/stlink-gui.ui", NULL)) { - /* woot */ + if (!gtk_builder_add_from_file (builder, ui_file, NULL)) { + g_printerr ("Failed to load UI file: %s\n", ui_file); + exit (1); } gui->window = GTK_WINDOW (gtk_builder_get_object (builder, "window")); -- 2.47.2