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

List:       kde-commits
Subject:    kdelibs/khtml
From:       Dirk Mueller <mueller () kde ! org>
Date:       2004-03-02 23:37:42
Message-ID: 20040302233742.9C688996F () office ! kde ! org
[Download RAW message or body]

CVS commit by mueller: 

avoid crash on ultra nasty freakingly broken QClipboard


  M +6 -7      khtml_ext.cpp   1.88


--- kdelibs/khtml/khtml_ext.cpp  #1.87:1.88
@@ -254,11 +254,4 @@ void KHTMLPartBrowserExtension::callExte
 void KHTMLPartBrowserExtension::updateEditActions()
 {
-    if ( !m_editableFormWidget )
-    {
-        enableAction( "cut", false );
-        enableAction( "paste", false );
-        return;
-    }
-
     // ### duplicated from KonqMainWindow::slotClipboardDataChanged
 #ifndef QT_NO_MIMECLIPBOARD // Handle minimalized versions of Qt Embedded
@@ -269,4 +262,10 @@ void KHTMLPartBrowserExtension::updateEd
     enableAction( "paste", data.contains("://"));
 #endif
+    if ( !m_editableFormWidget )
+    {
+        enableAction( "cut", false );
+        enableAction( "paste", false );
+        return;
+    }
 
     bool hasSelection = false;


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