Fixing application crash if images directory empty

git-svn-id: file:///svnroot/impuzzle/trunk@24 e6bec12f-0854-4cc4-ad26-6875f1509f77

diff --git a/debian/changelog b/debian/changelog
index 8758931..ba85419 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+impuzzle (0.6.2-1maemo0) unstable; urgency=low
+
+  * Fixes: Application crash if Mydocs/.images empty
+  * Changing default image
+
+ -- Timo Härkönen <timop.harkonen@gmail.com>  Sat, 29 May 2010 21:16:00 +0200
+
 impuzzle (0.6.1-1maemo0) unstable; urgency=low
 
   * Fixes: Preventing user interaction with image pieces during game setup that would lead to segfault.

diff --git a/src/images/default.jpg b/src/images/default.jpg
index 0ada032..1dd5320 100644 (file)
Binary files a/src/images/default.jpg and b/src/images/default.jpg differ

diff --git a/src/settingsdialog.cpp b/src/settingsdialog.cpp
index 0c0b4f1..b2cb6f8 100644 (file)
--- a/src/settingsdialog.cpp
+++ b/src/settingsdialog.cpp
@@ -108,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);

diff --git a/src/src.pro b/src/src.pro
index de22f3f..2b2b969 100644 (file)
--- a/src/src.pro
+++ b/src/src.pro
@@ -3,10 +3,7 @@ TARGET = impuzzle
 DEPENDPATH += .
 INCLUDEPATH += .
 DESTDIR = ../bin
-
-maemo5 {
-    QT += maemo5
-}
+maemo5:QT += maemo5
 
 # Input
 HEADERS += gameview.h \
@@ -18,7 +15,6 @@ HEADERS += gameview.h \
     settings.h \
     settingsdialog.h \
     aboutdialog.h
-
 SOURCES += gameview.cpp \
     main.cpp \
     mainwindow.cpp \
@@ -28,15 +24,12 @@ SOURCES += gameview.cpp \
     settings.cpp \
     settingsdialog.cpp \
     aboutdialog.cpp
-
 RESOURCES += resources.qrc
-
 desktop.files += impuzzle.desktop
 desktop.path = /usr/share/applications/hildon/
-
 icon.files += images/impuzzle.png
 icon.path = /usr/share/pixmaps/
-
 target.path = /opt/impuzzle/
-
-INSTALLS += target desktop icon
+INSTALLS += target \
+    desktop \
+    icon