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

Clean up OperationDetail timer initialization 

The timer variables were not being properly initialized leading to bogus
time values sometimes being displayed.
This commit is contained in:
Phillip Susi 2013-01-27 20:51:19 -05:00 committed by Curtis Gedak
parent b1ede01506
commit 7af47136ff
1 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/OperationDetail.cc
View File

@ -22,24 +22,16 @@
namespace GParted namespace GParted
{ {
OperationDetail::OperationDetail() OperationDetail::OperationDetail() : fraction( -1 ), cancelflag( 0 ), status( STATUS_NONE ), time_start( -1 ),
time_elapsed( -1 )
{ {
status = STATUS_NONE; // prevent uninitialized member access
cancelflag = 0;
set_status( STATUS_NONE ) ;
fraction = -1 ;
time_elapsed = -1 ;
} }
OperationDetail::OperationDetail( const Glib::ustring & description, OperationDetailStatus status, Font font ) OperationDetail::OperationDetail( const Glib::ustring & description, OperationDetailStatus status, Font font ) :
fraction( -1 ), cancelflag( 0 ), status( STATUS_NONE ), time_start( -1 ), time_elapsed( -1 )
{ {
cancelflag = 0;
this ->status = STATUS_NONE; // prevent uninitialized member access
set_description( description, font ); set_description( description, font );
set_status( status ); set_status( status );
fraction = -1 ;
time_elapsed = -1 ;
} }
OperationDetail::~OperationDetail() OperationDetail::~OperationDetail()
@ -92,6 +84,7 @@ void OperationDetail::set_status( OperationDetailStatus status )
break ; break ;
case STATUS_ERROR: case STATUS_ERROR:
case STATUS_SUCCES: case STATUS_SUCCES:
if( time_start != -1 )
time_elapsed = std::time( NULL ) - time_start ; time_elapsed = std::time( NULL ) - time_start ;
break ; break ;