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!

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
@@ -156,49 +156,49 @@ void TimeTabWidget::saveSettings( bool commit )
                 QCopEnvelope setTimeZone( "QPE/System", "timeChange(QString)" );
                 setTimeZone << tz;
 
                 // If controls have a valid date & time, update systemtime
                 int hour = sbHour->value();
                 if ( use12HourTime && cbAmpm->currentItem() == ValuePM )
                         hour += 12;
                 QDateTime dt( btnDate->date(), QTime ( hour, sbMin->value(), QTime::currentTime().second() ) );
                 setSystemTime( dt );
         }
         else
         {
                 // 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 );
         }
         else
         {
                 sbHour->setValue( t.hour() );
         }
         sbMin->setValue( t.minute() );
 
         // Set date
         btnDate->setDate( dt.date() );
 }
 
 void TimeTabWidget::setNTPBtnEnabled( bool enabled )
 {
@@ -218,49 +218,49 @@ void TimeTabWidget::setSystemTime( const QDateTime &dt )
                 if ( myTv.tv_sec != -1 )
                     ::settimeofday( &myTv, 0 );
 
                 /*
                  * Commit the datetime to the  'hardware'
                  * as Global::writeHWClock() is a NOOP with Opie Alarm
                  */
                 system("/sbin/hwclock --systohc --utc");
         }
 }
 
 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
         {
                 sbHour->setMinValue( 0 );
                 sbHour->setMaxValue( 23 );
 
                 if ( cbAmpm->currentItem() == ValuePM )
                 {
                         show_hour += 12;
                         if ( show_hour == 24 )
                                 show_hour = 0;
                 }
         }