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

List:       kde-commits
Subject:    KDE/kdelibs/khtml/misc
From:       Maks Orlovich <maksim () kde ! org>
Date:       2009-03-27 16:02:11
Message-ID: 1238169731.651995.15334.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 945528 by orlovich:

Forwardport fix for KHTMLGlobal recreation/exit crash


 M  +3 -0      htmlnames.cpp  


--- trunk/KDE/kdelibs/khtml/misc/htmlnames.cpp #945527:945528
@@ -8,6 +8,7 @@
 IDTable<NamespaceFactory>* NamespaceFactory::s_idTable;
 IDTable<NamespaceFactory>* NamespaceFactory::initIdTable()
 {
+    if (s_idTable) return s_idTable; // Can happen if KHTMLGlobal was recreated..
     s_idTable = new IDTable<NamespaceFactory>();
     s_idTable->addStaticMapping(DOM::xhtmlNamespace, XHTML_NAMESPACE);
     s_idTable->addStaticMapping(DOM::emptyNamespace, DOMString());
@@ -19,6 +20,7 @@
 IDTable<LocalNameFactory>* LocalNameFactory::s_idTable;
 IDTable<LocalNameFactory>* LocalNameFactory::initIdTable()
 {
+    if (s_idTable) return s_idTable; // Can happen if KHTMLGlobal was recreated..
     s_idTable = new IDTable<LocalNameFactory>();
     s_idTable->addStaticMapping(0, DOMString());
     s_idTable->addStaticMapping(localNamePart(ID_A), "a");
@@ -583,6 +585,7 @@
 IDTable<PrefixFactory>* PrefixFactory::s_idTable;
 IDTable<PrefixFactory>* PrefixFactory::initIdTable()
 {
+    if (s_idTable) return s_idTable; // Can happen if KHTMLGlobal was recreated..
     s_idTable = new IDTable<PrefixFactory>();
     s_idTable->addStaticMapping(DOM::emptyPrefix, DOMString());
     return s_idTable;
[prev in list] [next in list] [prev in thread] [next in thread]