diff --git a/src/web/api_v1.cpp b/src/web/api_v1.cpp
index eba9823bb..5ae2ae149 100644
--- a/src/web/api_v1.cpp
+++ b/src/web/api_v1.cpp
@@ -180,7 +180,7 @@ Api_v1::send404( QxtWebRequestEvent* event )
qDebug() << "404" << event->url.toString();
QxtWebPageEvent* wpe = new QxtWebPageEvent( event->sessionID, event->requestID, "
Not Found
" );
wpe->status = 404;
- wpe->statusMessage = "not feventound";
+ wpe->statusMessage = "no event found";
postEvent( wpe );
}
diff --git a/thirdparty/jreen b/thirdparty/jreen
index 2957d0ff0..8f995f246 160000
--- a/thirdparty/jreen
+++ b/thirdparty/jreen
@@ -1 +1 @@
-Subproject commit 2957d0ff03d9561af8afc4bd3a45947392868875
+Subproject commit 8f995f246637f533feb7124744e113034a32b505
diff --git a/thirdparty/qxt/qxtweb-standalone/qxtweb/qxthttpsessionmanager.cpp b/thirdparty/qxt/qxtweb-standalone/qxtweb/qxthttpsessionmanager.cpp
index ce9ccc907..c444018e3 100644
--- a/thirdparty/qxt/qxtweb-standalone/qxtweb/qxthttpsessionmanager.cpp
+++ b/thirdparty/qxt/qxtweb-standalone/qxtweb/qxthttpsessionmanager.cpp
@@ -682,6 +682,9 @@ void QxtHttpSessionManager::sendNextBlock(int requestID)
{
QSharedPointer& dataSource = connector()->getRequestDataSource( requestID );
QIODevice* device = connector()->getRequestConnection(requestID);
+ if (!device)
+ return;
+
if (!qxt_d().connectionState.contains(device)) return; // in case a disconnect signal and a bytesWritten signal get fired in the wrong order
QxtHttpSessionManagerPrivate::ConnectionState& state = qxt_d().connectionState[device];
if (state.finishedTransfer) return;
diff --git a/thirdparty/qxt/qxtweb-standalone/qxtweb/qxtmetaobject.cpp b/thirdparty/qxt/qxtweb-standalone/qxtweb/qxtmetaobject.cpp
index cad4f038f..e55fd3615 100644
--- a/thirdparty/qxt/qxtweb-standalone/qxtweb/qxtmetaobject.cpp
+++ b/thirdparty/qxt/qxtweb-standalone/qxtweb/qxtmetaobject.cpp
@@ -323,6 +323,11 @@ namespace QxtMetaObject
*/
bool connect(QObject* sender, const char* signal, QxtBoundFunction* slot, Qt::ConnectionType type)
{
+ if (!sender)
+ {
+ qWarning() << "Got connect() with a null sender!";
+ return false;
+ }
const QMetaObject* meta = sender->metaObject();
int methodID = meta->indexOfMethod(meta->normalizedSignature(signal).mid(1).constData());
if (methodID < 0)