remove non-existent devices from disabled_automount_devices at every
* src/GParted_Core.cc: remove non-existent devices from disabled_automount_devices at every rescan.
This commit is contained in:
parent
28343faa78
commit
f6c7a77859
|
@ -1,3 +1,8 @@
|
||||||
|
2006-04-04 Bart Hakvoort <hakvoort@cvs.gnome.org>
|
||||||
|
|
||||||
|
* src/GParted_Core.cc: remove non-existent devices from
|
||||||
|
disabled_automount_devices at every rescan.
|
||||||
|
|
||||||
2006-04-04 Bart Hakvoort <hakvoort@cvs.gnome.org>
|
2006-04-04 Bart Hakvoort <hakvoort@cvs.gnome.org>
|
||||||
|
|
||||||
* src/GParted_Core.cc: store libparted error in Partition::error if
|
* src/GParted_Core.cc: store libparted error in Partition::error if
|
||||||
|
|
|
@ -164,9 +164,12 @@ void GParted_Core::get_devices( std::vector<Device> & devices )
|
||||||
|
|
||||||
std::sort( device_paths .begin(), device_paths .end() ) ;
|
std::sort( device_paths .begin(), device_paths .end() ) ;
|
||||||
}
|
}
|
||||||
//FIXME: i guess this is the correct place to remove devices from disabled_automount_devices..
|
|
||||||
//this is necessary for people who remove and replug their usbdevice without restarting gparted
|
//remove non-existing devices from disabled_automount_devices..
|
||||||
//all devices not in device_paths yet availabl in disable_automount_devices should be removed..
|
for ( iter = disabled_automount_devices .begin() ; iter != disabled_automount_devices .end() ; ++iter )
|
||||||
|
if ( std::find( device_paths .begin(), device_paths .end(), iter ->first ) == device_paths .end() )
|
||||||
|
disabled_automount_devices .erase( iter ) ;
|
||||||
|
|
||||||
for ( unsigned int t = 0 ; t < device_paths .size() ; t++ )
|
for ( unsigned int t = 0 ; t < device_paths .size() ; t++ )
|
||||||
{
|
{
|
||||||
if ( check_device_path( device_paths[ t ] ) &&
|
if ( check_device_path( device_paths[ t ] ) &&
|
||||||
|
|
Loading…
Reference in New Issue