If we don't have resolutions then return an invalid one.

This should allow camerabin2 to start assuming it can negotiate
some sane defaults instead of crashing.

diff --git a/lib/qtcamimagesettings.cpp b/lib/qtcamimagesettings.cpp
index 0e3e51a..3bf1a08 100644 (file)
--- a/lib/qtcamimagesettings.cpp
+++ b/lib/qtcamimagesettings.cpp
@@ -156,6 +156,12 @@ QString QtCamImageSettings::profilePath() const {
 }
 
 QtCamImageResolution QtCamImageSettings::defaultResolution(const QString& aspectRatio) const {
+  if (d_ptr->resolutions.isEmpty()) {
+    return QtCamImageResolution(QString(), QString(),
+                               QSize(), QSize(), QSize(),
+                               -1, -1, -1, QString());
+  }
+
   if (aspectRatio.isEmpty()) {
     return d_ptr->resolutions[0];
   }

diff --git a/lib/qtcamvideosettings.cpp b/lib/qtcamvideosettings.cpp
index 4c4593d..c05ec75 100644 (file)
--- a/lib/qtcamvideosettings.cpp
+++ b/lib/qtcamvideosettings.cpp
@@ -149,6 +149,11 @@ QString QtCamVideoSettings::profilePath() const {
 }
 
 QtCamVideoResolution QtCamVideoSettings::defaultResolution(const QString& aspectRatio) const {
+  if (d_ptr->resolutions.isEmpty()) {
+    return QtCamVideoResolution(QString(), QString(), QSize(), QSize(),
+                               -1, -1, QString(), QString());
+  }
+
   if (aspectRatio.isEmpty()) {
     return d_ptr->resolutions[0];
   }