X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c905c0d60f4bd407cc4cbfd809d5cf8a51a61523..5e60a12a069e1e7e8213d41c8d3243e7d3b0913e:/src/common/combocmn.cpp

diff --git a/src/common/combocmn.cpp b/src/common/combocmn.cpp
index 588772db18..bf94d2253b 100644
--- a/src/common/combocmn.cpp
+++ b/src/common/combocmn.cpp
@@ -2249,6 +2249,7 @@ void wxComboCtrlBase::SetValueWithEvent(const wxString& value, bool withEvent)
             m_ignoreEvtText++;
 
         m_text->SetValue(value);
+
         if ( !(m_iFlags & wxCC_NO_TEXT_AUTO_SELECT) )
             m_text->SelectAll();
     }
@@ -2261,7 +2262,8 @@ void wxComboCtrlBase::SetValueWithEvent(const wxString& value, bool withEvent)
 
         EnsurePopupControl();
 
-        m_popupInterface->SetStringValue(value);
+        if (m_popupInterface)
+            m_popupInterface->SetStringValue(value);
     }
 
     Refresh();