[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/KDE/4.3/kdelibs/kate/utils
From:       David Nolden <david.nolden.kde () art-master ! de>
Date:       2009-09-11 23:45:09
Message-ID: 1252712709.795891.28819.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1022533 by zwabel:

Backport r1022512:
Lock the smart-mutex before creating the smart-range. This should prevent a possible crash.


 M  +9 -4      katesearchbar.cpp  


--- branches/KDE/4.3/kdelibs/kate/utils/katesearchbar.cpp #1022532:1022533
@@ -37,6 +37,7 @@
 #include <QtGui/QCursor>
 #include <QStringListModel>
 #include <QCompleter>
+#include <QMutexLocker>
 
 using namespace KTextEditor;
 
@@ -158,10 +159,14 @@
     m_layout->setMargin(2);
 
     // Init highlight
-    m_topRange = view()->doc()->newSmartRange(view()->doc()->documentRange());
-    static_cast<KateSmartRange*>(m_topRange)->setInternal();
-    m_topRange->setInsertBehavior(SmartRange::ExpandLeft | SmartRange::ExpandRight);
-    enableHighlights(true);
+    {
+      QMutexLocker lock(view()->doc()->smartMutex());
+      
+      m_topRange = view()->doc()->newSmartRange(view()->doc()->documentRange());
+      static_cast<KateSmartRange*>(m_topRange)->setInternal();
+      m_topRange->setInsertBehavior(SmartRange::ExpandLeft | SmartRange::ExpandRight);
+      enableHighlights(true);
+    }
 
 
     // Copy global to local config backup
[prev in list] [next in list] [prev in thread] [next in thread]