Fix korganizer crashbug on amd64.
Submitted by: Arjan Van Leeuwen <avleeuwen@gmail.com>
This commit is contained in:
parent
1bc9fd359f
commit
a89378820f
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=121271
@ -7,6 +7,7 @@
|
||||
|
||||
PORTNAME= kdepim
|
||||
PORTVERSION= ${KDE_VERSION}
|
||||
PORTREVISION= 1
|
||||
CATEGORIES= deskutils mail news palm kde
|
||||
MASTER_SITES= ${MASTER_SITE_KDE}
|
||||
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src
|
||||
|
@ -0,0 +1,11 @@
|
||||
--- korganizer/plugins/holidays/holidays.cpp.orig Tue Nov 9 21:00:17 2004
|
||||
+++ korganizer/plugins/holidays/holidays.cpp Tue Nov 9 21:01:01 2004
|
||||
@@ -91,7 +91,7 @@
|
||||
//static int lastYear = 0;
|
||||
int lastYear = 0;
|
||||
|
||||
- if (mHolidayFile.isEmpty()) return QString::null;
|
||||
+ if (mHolidayFile.isEmpty() || qd.isNull()) return QString::null;
|
||||
|
||||
//if ((lastYear == 0) || (qd.year() != lastYear)) {
|
||||
if ((yearLast == 0) || (qd.year() != yearLast)) {
|
@ -7,6 +7,7 @@
|
||||
|
||||
PORTNAME= kdepim
|
||||
PORTVERSION= ${KDE_VERSION}
|
||||
PORTREVISION= 1
|
||||
CATEGORIES= deskutils mail news palm kde
|
||||
MASTER_SITES= ${MASTER_SITE_KDE}
|
||||
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src
|
||||
|
@ -0,0 +1,11 @@
|
||||
--- korganizer/plugins/holidays/holidays.cpp.orig Tue Nov 9 21:00:17 2004
|
||||
+++ korganizer/plugins/holidays/holidays.cpp Tue Nov 9 21:01:01 2004
|
||||
@@ -91,7 +91,7 @@
|
||||
//static int lastYear = 0;
|
||||
int lastYear = 0;
|
||||
|
||||
- if (mHolidayFile.isEmpty()) return QString::null;
|
||||
+ if (mHolidayFile.isEmpty() || qd.isNull()) return QString::null;
|
||||
|
||||
//if ((lastYear == 0) || (qd.year() != lastYear)) {
|
||||
if ((yearLast == 0) || (qd.year() != yearLast)) {
|
@ -7,6 +7,7 @@
|
||||
|
||||
PORTNAME= kdepim
|
||||
PORTVERSION= ${KDE_VERSION}
|
||||
PORTREVISION= 1
|
||||
CATEGORIES= deskutils mail news palm kde
|
||||
MASTER_SITES= ${MASTER_SITE_KDE}
|
||||
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src
|
||||
|
@ -0,0 +1,11 @@
|
||||
--- korganizer/plugins/holidays/holidays.cpp.orig Tue Nov 9 21:00:17 2004
|
||||
+++ korganizer/plugins/holidays/holidays.cpp Tue Nov 9 21:01:01 2004
|
||||
@@ -91,7 +91,7 @@
|
||||
//static int lastYear = 0;
|
||||
int lastYear = 0;
|
||||
|
||||
- if (mHolidayFile.isEmpty()) return QString::null;
|
||||
+ if (mHolidayFile.isEmpty() || qd.isNull()) return QString::null;
|
||||
|
||||
//if ((lastYear == 0) || (qd.year() != lastYear)) {
|
||||
if ((yearLast == 0) || (qd.year() != yearLast)) {
|
Loading…
Reference in New Issue
Block a user