1 files changed, 33 insertions, 25 deletions

diff --git a/src/multimedia/camera/qcamera.cpp b/src/multimedia/camera/qcamera.cpp
index c7d64155c..46c6af9ff 100644
--- a/src/multimedia/camera/qcamera.cpp
+++ b/src/multimedia/camera/qcamera.cpp
@@ -206,12 +206,12 @@ void QCameraPrivate::initControls()
 
         error = QCamera::NoError;
     } else {
-        control = 0;
-        locksControl = 0;
-        deviceControl = 0;
-        infoControl = 0;
-        viewfinderSettingsControl = 0;
-        viewfinderSettingsControl2 = 0;
+        control = nullptr;
+        locksControl = nullptr;
+        deviceControl = nullptr;
+        infoControl = nullptr;
+        viewfinderSettingsControl = nullptr;
+        viewfinderSettingsControl2 = nullptr;
 
         error = QCamera::ServiceMissingError;
         errorString = QCamera::tr("The camera service is missing");
@@ -241,16 +241,16 @@ void QCameraPrivate::clear()
         provider->releaseService(service);
     }
 
-    cameraExposure = 0;
-    cameraFocus = 0;
-    imageProcessing = 0;
-    control = 0;
-    locksControl = 0;
-    deviceControl = 0;
-    infoControl = 0;
-    viewfinderSettingsControl = 0;
-    viewfinderSettingsControl2 = 0;
-    service = 0;
+    cameraExposure = nullptr;
+    cameraFocus = nullptr;
+    imageProcessing = nullptr;
+    control = nullptr;
+    locksControl = nullptr;
+    deviceControl = nullptr;
+    infoControl = nullptr;
+    viewfinderSettingsControl = nullptr;
+    viewfinderSettingsControl2 = nullptr;
+    service = nullptr;
 }
 
 void QCameraPrivate::updateLockStatus()
@@ -328,7 +328,7 @@ QCamera::QCamera(QObject *parent):
     d->init();
 
     // Select the default camera
-    if (d->service != 0 && d->deviceControl)
+    if (d->service != nullptr && d->deviceControl)
         d->deviceControl->setSelectedDevice(d->deviceControl->defaultDevice());
 }
 
@@ -362,9 +362,17 @@ QCamera::QCamera(const QByteArray& deviceName, QObject *parent):
 
     // The camera should not be used if device with requested name does not exist.
     if (!found) {
-        if (d->service && d->control)
-            d->service->releaseControl(d->control);
+        if (d->service) {
+            if (d->control)
+                d->service->releaseControl(d->control);
+            if (d->deviceControl)
+                d->service->releaseControl(d->deviceControl);
+            if (d->infoControl)
+                d->service->releaseControl(d->infoControl);
+        }
         d->control = nullptr;
+        d->deviceControl = nullptr;
+        d->infoControl = nullptr;
         d->error = QCamera::ServiceMissingError;
         d->errorString = QCamera::tr("The camera service is missing");
     }
@@ -401,7 +409,7 @@ QCamera::QCamera(QCamera::Position position, QObject *parent)
     Q_D(QCamera);
     d->init();
 
-    if (d->service != 0 && d->deviceControl) {
+    if (d->service != nullptr && d->deviceControl) {
         bool selectDefault = true;
 
         if (d->infoControl && position != UnspecifiedPosition) {
@@ -435,7 +443,7 @@ QCamera::~QCamera()
 QMultimedia::AvailabilityStatus QCamera::availability() const
 {
     Q_D(const QCamera);
-    if (d->control == NULL)
+    if (d->control == nullptr)
         return QMultimedia::ServiceMissing;
 
     if (d->deviceControl && d->deviceControl->deviceCount() == 0)
@@ -489,7 +497,7 @@ void QCamera::setViewfinder(QVideoWidget *viewfinder)
     // We don't know (in this library) that QVideoWidget inherits QObject
     QObject *viewFinderObject = reinterpret_cast<QObject*>(viewfinder);
 
-    d->viewfinder = viewFinderObject && bind(viewFinderObject) ? viewFinderObject : 0;
+    d->viewfinder = viewFinderObject && bind(viewFinderObject) ? viewFinderObject : nullptr;
 }
 
 /*!
@@ -510,7 +518,7 @@ void QCamera::setViewfinder(QGraphicsVideoItem *viewfinder)
     // but QObject inheritance depends on QObject coming first, so try this out.
     QObject *viewFinderObject = reinterpret_cast<QObject*>(viewfinder);
 
-    d->viewfinder = viewFinderObject && bind(viewFinderObject) ? viewFinderObject : 0;
+    d->viewfinder = viewFinderObject && bind(viewFinderObject) ? viewFinderObject : nullptr;
 }
 
 /*!
@@ -530,14 +538,14 @@ void QCamera::setViewfinder(QAbstractVideoSurface *surface)
         if (d->viewfinder)
             unbind(d->viewfinder);
 
-        d->viewfinder = 0;
+        d->viewfinder = nullptr;
 
         if (surface && bind(&d->surfaceViewfinder))
             d->viewfinder = &d->surfaceViewfinder;
     } else if (!surface) {
         //unbind the surfaceViewfinder if null surface is set
         unbind(&d->surfaceViewfinder);
-        d->viewfinder = 0;
+        d->viewfinder = nullptr;
     }
 }