summaryrefslogtreecommitdiff
authorerik <erik>2007-04-23 20:38:22 (UTC)
committer erik <erik>2007-04-23 20:38:22 (UTC)
commitd38e40fe9ee475230425fa83e924c49e5946b87c (patch) (side-by-side diff)
treef10fceda92538e1bc9cee66f82062773974ec092
parent1edbb754d3c8cfccf1630e2ad1e531e907555cbd (diff)
downloadopie-d38e40fe9ee475230425fa83e924c49e5946b87c.zip
opie-d38e40fe9ee475230425fa83e924c49e5946b87c.tar.gz
opie-d38e40fe9ee475230425fa83e924c49e5946b87c.tar.bz2
Fix for bug 1848 where the outcome of setting the time to 12:00AM did not
work. This commit is based on a patch submitted by harlekin. Thank you!
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/settings/netsystemtime/timetabwidget.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/noncore/settings/netsystemtime/timetabwidget.cpp b/noncore/settings/netsystemtime/timetabwidget.cpp
index 895514b..e6fcf7f 100644
--- a/noncore/settings/netsystemtime/timetabwidget.cpp
+++ b/noncore/settings/netsystemtime/timetabwidget.cpp
@@ -168,25 +168,25 @@ void TimeTabWidget::saveSettings( bool commit )
// Reset systemtime to hardware clock (i.e. undo any changes made by this app)
system("/sbin/hwclock --hctosys --utc");
}
}
void TimeTabWidget::setDateTime( const QDateTime &dt )
{
// Set time
QTime t = dt.time();
if( use12HourTime )
{
int show_hour = t.hour();
- if ( t.hour() >= 12 )
+ if ( t.hour() > 12 )
{
show_hour -= 12;
cbAmpm->setCurrentItem( ValuePM );
}
else
{
cbAmpm->setCurrentItem( ValueAM );
}
if ( show_hour == 0 )
show_hour = 12;
sbHour->setValue( show_hour );
}
@@ -230,25 +230,25 @@ void TimeTabWidget::slotUse12HourTime( int i )
{
use12HourTime = (i == 1);
cbAmpm->setEnabled( use12HourTime );
int show_hour = sbHour->value();
if ( use12HourTime )
{
sbHour->setMinValue( 1 );
sbHour->setMaxValue( 12 );
- if ( show_hour >= 12 )
+ if ( show_hour > 12 )
{
show_hour -= 12;
cbAmpm->setCurrentItem( ValuePM );
}
else
{
cbAmpm->setCurrentItem( ValueAM );
}
if ( show_hour == 0 )
show_hour = 12;
}
else