fakevim: fix crash on shutdown

This commit is contained in:
hjk
2010-05-10 08:40:15 +02:00
parent 9721a142dd
commit 0dd38fb829

View File

@@ -128,7 +128,6 @@ namespace Internal {
#define StartOfDocument QTextCursor::Start #define StartOfDocument QTextCursor::Start
#define EDITOR(s) (m_textedit ? m_textedit->s : m_plaintextedit->s) #define EDITOR(s) (m_textedit ? m_textedit->s : m_plaintextedit->s)
#define DEDITOR(s) (d->m_textedit ? d->m_textedit->s : d->m_plaintextedit->s)
const int ParagraphSeparator = 0x00002029; const int ParagraphSeparator = 0x00002029;
@@ -4425,7 +4424,12 @@ bool FakeVimHandler::eventFilter(QObject *ob, QEvent *ev)
bool active = theFakeVimSetting(ConfigUseFakeVim)->value().toBool(); bool active = theFakeVimSetting(ConfigUseFakeVim)->value().toBool();
// Catch mouse events on the viewport. // Catch mouse events on the viewport.
if (ob == DEDITOR(viewport())) { QWidget *viewport = 0;
if (d->m_plaintextedit)
viewport = d->m_plaintextedit->viewport();
else if (d->m_textedit)
viewport = d->m_textedit->viewport();
if (ob == viewport) {
if (active && ev->type() == QEvent::MouseButtonRelease) { if (active && ev->type() == QEvent::MouseButtonRelease) {
QMouseEvent *mev = static_cast<QMouseEvent *>(ev); QMouseEvent *mev = static_cast<QMouseEvent *>(ev);
if (mev->button() == Qt::LeftButton) { if (mev->button() == Qt::LeftButton) {