Add patches

[fw/stlink] / gui / stlink-gui.c

diff --git a/gui/stlink-gui.c b/gui/stlink-gui.c
index 756d7666cb9211aca32e0e1bb40fa9fc15dc51b3..3646c3a4fca118ab2c5e129cbfbf9acff432fff4 100644 (file)
--- a/gui/stlink-gui.c
+++ b/gui/stlink-gui.c
@@ -528,9 +528,9 @@ connect_button_cb (GtkWidget *widget, gpointer data)
                return;
 
        /* try version 1 then version 2 */
-       gui->sl = stlink_v1_open(0);
+       gui->sl = stlink_v1_open(0, 1);
        if (gui->sl == NULL) {
-           gui->sl = stlink_open_usb(0);
+           gui->sl = stlink_open_usb(0, 1);
        }
        if (gui->sl == NULL) {
                stlink_gui_set_info_error_message (gui, "Failed to connect to STLink.");                return;
@@ -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"));