From 551a907329120b6fdda882a0c1831fc94dc69f55 Mon Sep 17 00:00:00 2001
From: Martin Dobias <wonder.sk@gmail.com>
Date: Sun, 21 May 2017 14:36:40 +0800
Subject: [PATCH] Fix a crash when confirming config dialog of a locator filter

The locator was getting invalidated, but there was no feedback object associated for cancellation.
---
 src/gui/locator/qgslocator.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/gui/locator/qgslocator.cpp b/src/gui/locator/qgslocator.cpp
index 20873ba9b19..72f9e92a78e 100644
--- a/src/gui/locator/qgslocator.cpp
+++ b/src/gui/locator/qgslocator.cpp
@@ -140,7 +140,8 @@ void QgsLocator::cancel()
 
 void QgsLocator::cancelWithoutBlocking()
 {
-  mFeedback->cancel();
+  if ( mFeedback )
+    mFeedback->cancel();
 }
 
 bool QgsLocator::isRunning() const