Mirrors
/
gparted
mirror of https://gitlab.gnome.org/GNOME/gparted.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed small issue with lp_partition ->geom stuff sometimes losing values 

* src/GParted_Core.cc: fixed small issue with lp_partition ->geom
  stuff sometimes losing values when going out of scope.
This commit is contained in:
Bart Hakvoort 2006-08-13 14:13:33 +00:00
parent 9576eb981e
commit 5c66a79669
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2006-08-13 Bart Hakvoort <hakvoort@cvs.gnome.org>
* src/GParted_Core.cc: fixed small issue with lp_partition ->geom
stuff sometimes losing values when going out of scope.
2006-08-13 Bart Hakvoort <hakvoort@cvs.gnome.org> 2006-08-13 Bart Hakvoort <hakvoort@cvs.gnome.org>
* include/GParted_Core.h, * include/GParted_Core.h,

17
src/GParted_Core.cc
View File

@ -1368,6 +1368,10 @@ bool GParted_Core::resize_move_partition( const Partition & partition_old,
PedConstraint *constraint = NULL ; PedConstraint *constraint = NULL ;
lp_partition = NULL ; lp_partition = NULL ;
//sometimes the lp_partition ->geom .start,end and length values display random numbers
//after going out of the 'if ( lp_partition)' scope. That's why we use some variables here.
Sector new_start = -1, new_end = -1 ;
if ( open_device_and_disk( partition_old .device_path ) ) if ( open_device_and_disk( partition_old .device_path ) )
{ {
if ( partition_old .type == GParted::TYPE_EXTENDED ) if ( partition_old .type == GParted::TYPE_EXTENDED )
@ -1389,7 +1393,12 @@ bool GParted_Core::resize_move_partition( const Partition & partition_old,
constraint, constraint,
partition_new .sector_start, partition_new .sector_start,
partition_new .sector_end ) ) partition_new .sector_end ) )
{
new_start = lp_partition ->geom .start ;
new_end = lp_partition ->geom .end ;
return_value = commit() ; return_value = commit() ;
}
ped_constraint_destroy( constraint ); ped_constraint_destroy( constraint );
} }
@ -1402,11 +1411,11 @@ bool GParted_Core::resize_move_partition( const Partition & partition_old,
{ {
operation_details .back() .sub_details .push_back( operation_details .back() .sub_details .push_back(
OperationDetail( OperationDetail(
String::ucompose( _("new start: %1"), lp_partition ->geom .start ) + "\n" + String::ucompose( _("new start: %1"), new_start ) + "\n" +
String::ucompose( _("new end: %1"), lp_partition ->geom .end ) + "\n" + String::ucompose( _("new end: %1"), new_end ) + "\n" +
String::ucompose( _("new size: %1 (%2)"), String::ucompose( _("new size: %1 (%2)"),
lp_partition ->geom .length, new_end - new_start + 1,
Utils::format_size( lp_partition ->geom .length ) ), Utils::format_size( new_end - new_start + 1 ) ),
STATUS_NONE, STATUS_NONE,
FONT_ITALIC ) ) ; FONT_ITALIC ) ) ;
} }