Merge branch 'gfio' of ssh://brick.kernel.dk/data/git/fio into gfio
authorJens Axboe <axboe@kernel.dk>
Tue, 13 Mar 2012 07:08:48 +0000 (08:08 +0100)
committerJens Axboe <axboe@kernel.dk>
Tue, 13 Mar 2012 07:08:48 +0000 (08:08 +0100)
1  2 
gfio.c

diff --combined gfio.c
index 019ef765a0dc9674381344784481dca442a0614a,51bac2aa8e864577a5aa35f33aebebdccf1e74e9..1251292e3a5666f3908a6ed64d5bfc5e4867635a
--- 1/gfio.c
--- 2/gfio.c
+++ b/gfio.c
@@@ -496,15 -496,15 +496,15 @@@ static void update_button_states(struc
        if (w)
                gtk_widget_set_sensitive(w, connect_state);
  
 -      w = gtk_ui_manager_get_widget(ui->uimanager, "/MainMenu/JobMenu/Edit Job");
 +      w = gtk_ui_manager_get_widget(ui->uimanager, "/MainMenu/JobMenu/Edit job");
        if (w)
                gtk_widget_set_sensitive(w, edit_state);
  
 -      w = gtk_ui_manager_get_widget(ui->uimanager, "/MainMenu/JobMenu/Send Job");
 +      w = gtk_ui_manager_get_widget(ui->uimanager, "/MainMenu/JobMenu/Send job");
        if (w)
                gtk_widget_set_sensitive(w, send_state);
  
 -      w = gtk_ui_manager_get_widget(ui->uimanager, "/MainMenu/JobMenu/Start Job");
 +      w = gtk_ui_manager_get_widget(ui->uimanager, "/MainMenu/JobMenu/Start job");
        if (w)
                gtk_widget_set_sensitive(w, start_state);
  }
@@@ -1738,8 -1738,8 +1738,8 @@@ static void start_job_clicked(__attribu
        struct gui_entry *ge = data;
        struct gfio_client *gc = ge->client;
  
-       gtk_widget_set_sensitive(ge->button[START_JOB_BUTTON], 0);
-       fio_start_client(gc->client);
+       if (gc)
+               fio_start_client(gc->client);
  }
  
  static void file_open(GtkWidget *w, gpointer data);