[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdepimlibs/kholidays
From:       Sergio Luis Martins <iamsergio () gmail ! com>
Date:       2010-01-28 20:36:15
Message-ID: 1264710975.240855.23569.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1081594 by smartins:

Don't crash when you don't use a holiday location.

CCMAIL: johnlayt@googlemail.com


 M  +3 -4      holidayregion.cpp  


--- trunk/KDE/kdepimlibs/kholidays/holidayregion.cpp #1081593:1081594
@@ -39,13 +39,12 @@
 {
   public:
     Private( const QString &location )
-      : mLocation( location )
+      : mDriver( 0 ), mLocation( location )
     {
       if ( !mLocation.isEmpty() ) {
         mHolidayFile = KStandardDirs::locate( "data", "libkholidays/holiday_" + mLocation );
         if ( mHolidayFile.isEmpty() ) {
           mLocation.clear();
-          mDriver = 0;
         } else {
           mDriver = new HolidayParserDriverPlanOld( mHolidayFile );
         }
@@ -54,7 +53,7 @@
 
     ~Private()
     {
-        delete mDriver;
+      delete mDriver;
     }
 
     HolidayParserDriver  *mDriver;
@@ -94,7 +93,7 @@
 
 bool HolidayRegion::isValid() const
 {
-  return !d->mHolidayFile.isEmpty();
+  return !d->mHolidayFile.isEmpty() && d->mDriver;
 }
 
 Holiday::List HolidayRegion::holidays( const QDate &startDate, const QDate &endDate ) const
[prev in list] [next in list] [prev in thread] [next in thread]