From a12a9f491cb31ff5c22f1051bb22ccfef6c65217 Mon Sep 17 00:00:00 2001
From: hluk <hluk@email.cz>
Date: Thu, 26 Sep 2013 18:06:20 +0200
Subject: [PATCH] FakeVim: Ensure that enterFakeVim() is not called recursively
Task-number: QTCREATORBUG-10226
Change-Id: Ib58d43dc11071a5dc28bad53e13213a4413fca71
Reviewed-by: hjk <hjk121@nokiamail.com>
---
src/plugins/fakevim/fakevimhandler.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/plugins/fakevim/fakevimhandler.cpp b/src/plugins/fakevim/fakevimhandler.cpp
index fa637b44e8b..7716c0094ff 100644
--- a/src/plugins/fakevim/fakevimhandler.cpp
+++ b/src/plugins/fakevim/fakevimhandler.cpp
@@ -2030,7 +2030,7 @@ void FakeVimHandler::Private::focus()
void FakeVimHandler::Private::enterFakeVim()
{
- QTC_ASSERT(!m_inFakeVim, qDebug() << "enterFakeVim() shouldn't be called recursively!");
+ QTC_ASSERT(!m_inFakeVim, qDebug() << "enterFakeVim() shouldn't be called recursively!"; return);
m_cursor = EDITOR(textCursor());
m_inFakeVim = true;
@@ -2054,7 +2054,7 @@ void FakeVimHandler::Private::enterFakeVim()
void FakeVimHandler::Private::leaveFakeVim(bool needUpdate)
{
- QTC_ASSERT(m_inFakeVim, qDebug() << "enterFakeVim() not called before leaveFakeVim()!");
+ QTC_ASSERT(m_inFakeVim, qDebug() << "enterFakeVim() not called before leaveFakeVim()!"; return);
// The command might have destroyed the editor.
if (m_textedit || m_plaintextedit) {
--
GitLab