Skip to content
Permalink
Browse files

Fix crash when 'use popup' is selected for time based datetime widgets

(cherry-picked from 63cc762)
  • Loading branch information
nyalldawson committed Sep 14, 2016
1 parent e6a1d5f commit 3bc6c47653d8860883717b8a030398f1fd33764c
@@ -66,7 +66,7 @@ void QgsDateTimeEditWrapper::initWidget( QWidget *editor )

const bool calendar = config( "calendar_popup", false ).toBool();
mQDateTimeEdit->setCalendarPopup( calendar );
if ( calendar )
if ( calendar && mQDateTimeEdit->calendarWidget() )
{
// highlight today's date
QTextCharFormat todayFormat;
@@ -156,7 +156,7 @@ void QgsDateTimeSearchWidgetWrapper::initWidget( QWidget* editor )

const bool calendar = config( "calendar_popup", false ).toBool();
mDateTimeEdit->setCalendarPopup( calendar );
if ( calendar )
if ( calendar && mDateTimeEdit->calendarWidget() )
{
// highlight today's date
QTextCharFormat todayFormat;

0 comments on commit 3bc6c47

Please sign in to comment.
You can’t perform that action at this time.