summaryrefslogtreecommitdiffstats
path: root/core/io
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2019-07-02 21:42:13 +0200
committerGitHub <noreply@github.com>2019-07-02 21:42:13 +0200
commit9e134407d485a3cbf8a9eb00b731ab63df5d9b9d (patch)
treeb3084bedbcfa98c4f60fa76758984b1d67ef650a /core/io
parente0d610203c5194400a5932f36ae0d96c8ede7f0f (diff)
parentc798173332ec2c622a5c00f1434b31cad6df8ece (diff)
downloadredot-engine-9e134407d485a3cbf8a9eb00b731ab63df5d9b9d.tar.gz
Merge pull request #30252 from Faless/tls/disable_no_crash
Fix editor crash when StreamPeerSSL is unavilable.
Diffstat (limited to 'core/io')
-rw-r--r--core/io/stream_peer_ssl.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/core/io/stream_peer_ssl.cpp b/core/io/stream_peer_ssl.cpp
index 254ae84bf5..ccce48ccd7 100644
--- a/core/io/stream_peer_ssl.cpp
+++ b/core/io/stream_peer_ssl.cpp
@@ -39,7 +39,9 @@ StreamPeerSSL *(*StreamPeerSSL::_create)() = NULL;
StreamPeerSSL *StreamPeerSSL::create() {
- return _create();
+ if (_create)
+ return _create();
+ return NULL;
}
StreamPeerSSL::LoadCertsFromMemory StreamPeerSSL::load_certs_func = NULL;