Fixing application crash if images directory empty

[impuzzle] / src / settingsdialog.cpp

diff --git a/src/settingsdialog.cpp b/src/settingsdialog.cpp
index 58d4ca0..b2cb6f8 100644 (file)
--- a/src/settingsdialog.cpp
+++ b/src/settingsdialog.cpp
@@ -97,6 +97,7 @@ void SettingsDialog::imageSelectionChanged(const QString &txt)
         qDebug() << "Random image selected";
 
         // Get random image from ~/MyDocs/.images/
+        //TODO: images from other directories
         QStringList filters;
         filters << "*.jpg" << "*.png" << "*.xpm";
 
@@ -107,9 +108,15 @@ void SettingsDialog::imageSelectionChanged(const QString &txt)
 
         qDebug() << QString("pics list contains %1 entries").arg(pics.count());
 
-        QString path = QDir::homePath() + QLatin1String("/MyDocs/.images/") + pics.at(qrand() % pics.count());
-        Settings::instance()->setImage(QPixmap(path));
-        Settings::instance()->setImagePath(path);
+        if(!pics.isEmpty()) {
+            QString path = QDir::homePath() + QLatin1String("/MyDocs/.images/") + pics.at(qrand() % pics.count());
+            Settings::instance()->setImage(QPixmap(path));
+            Settings::instance()->setImagePath(path);
+        }
+        else {
+            Settings::instance()->setImage(0);
+            Settings::instance()->setImagePath("");
+        }
 
         if(selectedImageLabel_->isVisible()) {
             selectedImageLabel_->setVisible(false);
@@ -133,7 +140,7 @@ void SettingsDialog::imageSelectionChanged(const QString &txt)
         }
     }
     else {
-        qDebug() << "Default image selected";
+        //qDebug() << "Default image selected";
 
         Settings::instance()->setImage(0);
         Settings::instance()->setImagePath("default");