Combine two wxImage-to-pixmap creation functions into one.

[wxWidgets.git] / src / common / url.cpp

diff --git a/src/common/url.cpp b/src/common/url.cpp
index 084a93ca85d4509caa63e134684c54bc6384a974..14ebd7b851971f4524348072b4f872d3a75c1aca 100644 (file)
--- a/src/common/url.cpp
+++ b/src/common/url.cpp
@@ -23,9 +23,9 @@
 #ifndef WX_PRECOMP
     #include "wx/list.h"
     #include "wx/string.h"
+    #include "wx/utils.h"
 #endif
 
-#include "wx/utils.h"
 #include "wx/module.h"
 
 #include <string.h>
@@ -185,7 +185,9 @@ void wxURL::CleanData()
 #if wxUSE_PROTOCOL_HTTP
     if (!m_useProxy)
 #endif // wxUSE_PROTOCOL_HTTP
-        delete m_protocol;
+        if (m_protocol)
+            // Need to safely delete the socket (pending events)
+            m_protocol->Destroy();
 }
 
 wxURL::~wxURL()