Fix program freeze on Week day selection widget

diff --git a/qmaemo5weekdayspickselector.cpp b/qmaemo5weekdayspickselector.cpp
index 2c87548..fa2a812 100644 (file)
--- a/qmaemo5weekdayspickselector.cpp
+++ b/qmaemo5weekdayspickselector.cpp
@@ -23,12 +23,13 @@
 
 QMaemo5WeekDaysPickSelector::QMaemo5WeekDaysPickSelector(QObject *parent): QMaemo5AbstractPickSelector(parent)
 {
-  pick_widget = new QMaemo5WeekDaysPickWidget;
-  connect(pick_widget, SIGNAL(selectedDays(QList<int>)), this, SLOT(updateSelection(QList<int>)));
 }
 
+
 QWidget* QMaemo5WeekDaysPickSelector::widget(QWidget* parent) {
-  Q_UNUSED(parent);
+  QMaemo5WeekDaysPickWidget *pick_widget = new QMaemo5WeekDaysPickWidget(parent);
+  pick_widget->setSelected(selection);
+  connect(pick_widget, SIGNAL(selectedDays(QList<int>)), this, SLOT(updateSelection(QList<int>)));
   return pick_widget;
 }
 
@@ -40,7 +41,6 @@ QString QMaemo5WeekDaysPickSelector::currentValueText() const {
 void QMaemo5WeekDaysPickSelector::updateSelection(QList<int> new_sel) {
   qDebug("New selection size: %d", new_sel.size());
   selection = new_sel;
-  pick_widget->setSelected(selection);
   emit selected(currentValueText());
 }
 

diff --git a/qmaemo5weekdayspickselector.h b/qmaemo5weekdayspickselector.h
index 2962c21..27c6e5c 100644 (file)
--- a/qmaemo5weekdayspickselector.h
+++ b/qmaemo5weekdayspickselector.h
@@ -37,7 +37,6 @@ public slots:
     void updateSelection(QList<int> new_sel);
 
 private:
-    QMaemo5WeekDaysPickWidget *pick_widget;
     QList<int> selection;
 };
 

diff --git a/qmaemo5weekdayspickwidget.cpp b/qmaemo5weekdayspickwidget.cpp
index 2a40e52..00a3746 100644 (file)
--- a/qmaemo5weekdayspickwidget.cpp
+++ b/qmaemo5weekdayspickwidget.cpp
@@ -66,6 +66,7 @@ QMaemo5WeekDaysPickWidget::QMaemo5WeekDaysPickWidget(QWidget *parent) :
   button_box->addButton(done_btn, QDialogButtonBox::ActionRole);
   vLayoutR->addWidget(button_box);
   hLayout->addLayout(vLayoutR);
+  qDebug("QMaemo5WeekDaysPickWidget constructed");
 }
 
 void QMaemo5WeekDaysPickWidget::setSelected(QList<int> days) {