summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/gui/inputmethod/qcoefepinputcontext_s60.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
index 8612e55..e3427ec 100644
--- a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
+++ b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
@@ -13,6 +13,7 @@
#include "qcoefepinputcontext_p.h"
#include <qapplication.h>
+#include <private/qapplication_p.h>
#include <qtextformat.h>
#include <fepitfr.h>
@@ -59,9 +60,12 @@ QCoeFepInputContext::~QCoeFepInputContext()
// This is to make sure that the FEP manager "forgets" about us,
// otherwise we may get callbacks even after we're destroyed.
// The call is asynchronous though, so we must spin the event loop
- // to make sure it gets detected.
+ // to make sure it gets detected. However we will not spin eventloop
+ // in case that app is closing, since eventDispatcher is already deleted.
CCoeEnv::Static()->InputCapabilitiesChanged();
- QApplication::processEvents();
+ if(!QApplicationPrivate::is_app_closing) {
+ QApplication::processEvents();
+ }
if (m_fepState)
delete m_fepState;