filename | src/gdlist.c |
changeset | 1109:700c5ab26a63 |
prev | 1097:d4807997e450 |
next | 1296:30ecee61f811 |
author | Nathan Keynes <nkeynes@lxdream.org> |
date | Fri Dec 16 10:08:45 2011 +1000 (12 years ago) |
permissions | -rw-r--r-- |
last change | Add volatile qualifier to return-address frobbing - works around optimizer bug in GCC versions after 4.2 |
file | annotate | diff | log | raw |
1.1 --- a/src/gdlist.c Sun Jan 31 18:35:06 2010 +10001.2 +++ b/src/gdlist.c Fri Dec 16 10:08:45 2011 +10001.3 @@ -147,7 +147,7 @@1.4 CALL_HOOKS( gdrom_list_change_hook, TRUE, gdrom_list_get_selection() );1.5 }1.7 -gboolean gdrom_list_set_selection( int posn )1.8 +gboolean gdrom_list_set_selection( int posn, ERROR *err )1.9 {1.10 if( posn == 0 ) { // Always 'Empty'1.11 gdrom_unmount_disc();1.12 @@ -156,15 +156,17 @@1.14 if( posn <= gdrom_device_count ) {1.15 cdrom_drive_t device = g_list_nth_data(gdrom_device_list, posn-1);1.16 - return gdrom_mount_image(device->name);1.17 + return gdrom_mount_image(device->name, err);1.18 }1.20 posn -= FIRST_RECENT_INDEX;1.21 if( posn >= 0 && posn < gdrom_recent_count ) {1.22 gchar *entry = g_list_nth_data(gdrom_recent_list, posn);1.23 - return gdrom_mount_image(entry);1.24 + return gdrom_mount_image(entry, err);1.25 }1.27 + /* Should never happen */1.28 + SET_ERROR( err, LX_ERR_BUG, "Invalid selection: This is probably a bug" );1.29 return FALSE;1.30 }
.