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

(cherry-picked from 63cc762)
qgis · Sep 14, 2016 · 3bc6c47 · 3bc6c47
1 parent e6a1d5f
commit 3bc6c47
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/gui/editorwidgets/qgsdatetimeeditwrapper.cpp b/src/gui/editorwidgets/qgsdatetimeeditwrapper.cpp
@@ -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;

diff --git a/src/gui/editorwidgets/qgsdatetimesearchwidgetwrapper.cpp b/src/gui/editorwidgets/qgsdatetimesearchwidgetwrapper.cpp
@@ -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;