Crash if I click Leave | Switch user [Fedora] (#347962)
parent
c80fc74be5
commit
e7c215d385
@ -1,2 +1 @@
|
||||
/kdeclarative-5.18.0.tar.xz
|
||||
/kdeclarative-5.19.0.tar.xz
|
||||
|
@ -0,0 +1,43 @@
|
||||
From 24d27b9cb733f727431c64e0a7845c39152c1104 Mon Sep 17 00:00:00 2001
|
||||
From: Aleix Pol <aleixpol@kde.org>
|
||||
Date: Tue, 16 Feb 2016 02:11:35 +0100
|
||||
Subject: [PATCH 2/2] Don't call null object pointer
|
||||
|
||||
BUG: 347962
|
||||
REVIEW: 127060
|
||||
---
|
||||
src/kdeclarative/qmlobject.cpp | 11 ++++++++---
|
||||
1 file changed, 8 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/src/kdeclarative/qmlobject.cpp b/src/kdeclarative/qmlobject.cpp
|
||||
index f3cee66..db09a0a 100644
|
||||
--- a/src/kdeclarative/qmlobject.cpp
|
||||
+++ b/src/kdeclarative/qmlobject.cpp
|
||||
@@ -113,9 +113,7 @@ void QmlObjectPrivate::errorPrint(QQmlComponent *component)
|
||||
void QmlObjectPrivate::execute(const QUrl &source)
|
||||
{
|
||||
if (source.isEmpty()) {
|
||||
-#ifndef NDEBUG
|
||||
- qDebug() << "File name empty!";
|
||||
-#endif
|
||||
+ qWarning() << "File name empty!";
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -309,6 +307,13 @@ void QmlObject::completeInitialization(const QVariantHash &initialProperties)
|
||||
if (d->incubator.object()) {
|
||||
return;
|
||||
}
|
||||
+
|
||||
+ if (!d->component) {
|
||||
+ qWarning() << "No component for" << source();
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
+
|
||||
if (d->component->status() != QQmlComponent::Ready || d->component->isError()) {
|
||||
d->errorPrint(d->component);
|
||||
return;
|
||||
--
|
||||
2.5.0
|
||||
|
Loading…
Reference in new issue