mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-28 05:00:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix progress bar during libdivecomputer imports

Browse source 
As reported by Mauro Dreissig, the progress bar doesn't work and causes
a SIGSEGV due to a missing allocation.  The code broke when Dirk
separated out the GUI from the core code, and I hadn't tried
divecomputer downloads since.

Reported-by: Mauro Dreissig <mukadr@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Linus Torvalds 2011-09-22 16:38:24 -07:00
parent 15463fdeb2
commit c0adfdc41b
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gtk-gui.c
View file

@ -616,8 +616,8 @@ void import_dialog(GtkWidget *w, gpointer data)
hbox = gtk_hbox_new(FALSE, 6);
gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), hbox, FALSE, TRUE, 3);
devicedata.progress->bar = gtk_progress_bar_new();
gtk_container_add(GTK_CONTAINER(hbox), devicedata.progress->bar);
devicedata.progress.bar = gtk_progress_bar_new();
gtk_container_add(GTK_CONTAINER(hbox), devicedata.progress.bar);
gtk_widget_show_all(dialog);
result = gtk_dialog_run(GTK_DIALOG(dialog));

2
libdivecomputer.c
View file

@ -369,7 +369,7 @@ static void event_cb(device_t *device, device_event_t event, const void *data, v
printf("Event: waiting for user action\n");
break;
case DEVICE_EVENT_PROGRESS:
update_progressbar(devdata->progress,
update_progressbar(&devdata->progress,
(double) progress->current / (double) progress->maximum);
break;
case DEVICE_EVENT_DEVINFO:

2
libdivecomputer.h
View file

@ -22,7 +22,7 @@
typedef struct device_data_t {
device_type_t type;
const char *name, *devname;
progressbar_t *progress;
progressbar_t progress;
device_devinfo_t devinfo;
device_clock_t clock;
} device_data_t;