From 0cc14f643e2074d0c20a03cb8dcf37d029256ff1 Mon Sep 17 00:00:00 2001 From: mbreugel Date: Mon, 8 Sep 2008 10:52:59 +0000 Subject: [PATCH] These assertions do trigger, exit gracefully instead. The pickedLanguage one happens while editing CMakeLists. git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdevplatform@858583 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- plugins/contextbrowser/contextbrowser.cpp | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/plugins/contextbrowser/contextbrowser.cpp b/plugins/contextbrowser/contextbrowser.cpp index 1df919e..06ee52b 100644 --- a/plugins/contextbrowser/contextbrowser.cpp +++ b/plugins/contextbrowser/contextbrowser.cpp @@ -295,9 +295,13 @@ bool ContextBrowserPlugin::findSpecialObject(View* view, const SimpleCursor& pos if(m_highlightedRange.contains(view)) { // remove old highlighting QMutexLocker lock(iface->smartMutex()); - Q_ASSERT(m_highlightedRange[view]->document() == view->document()); - delete m_highlightedRange[view]; - m_highlightedRange.remove(view); + //Q_ASSERT(m_highlightedRange[view]->document() == view->document()); + if (m_highlightedRange[view]->document() == view->document()) { + delete m_highlightedRange[view]; + m_highlightedRange.remove(view); + } else { + kDebug() << "m_highlightedRange[view]->document() != view->document()"; + } } KUrl viewUrl = view->document()->url(); @@ -358,7 +362,11 @@ bool ContextBrowserPlugin::showDeclarationView(View* view, const SimpleCursor& p bool ContextBrowserPlugin::showSpecialObjectView(View* view, const SimpleCursor& position, ILanguage* pickedLanguage, DUContext* ctx) { - Q_ASSERT(pickedLanguage != 0); // specialObject was found, pickedLanguage must have been set + //Q_ASSERT(pickedLanguage != 0); // specialObject was found, pickedLanguage must have been set + if (!pickedLanguage) { + kDebug() << "Special's object language turned null."; + return false; + } bool success = false; foreach(ContextBrowserView* contextView, m_views) { if(masterWidget(contextView) == masterWidget(view)) { -- 2.11.4.GIT