From aaf84071b059f825501eb99dc820c0ab71b4e8b2 Mon Sep 17 00:00:00 2001 From: eshe Date: Mon, 26 Jul 2010 19:22:46 +0100 Subject: [PATCH] Fixed a segfault in theme scheduler. --- src/poisettings.cpp | 2 +- src/themescheduler.cpp | 2 +- src/themeschedulersettings.cpp | 12 +++++------- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/poisettings.cpp b/src/poisettings.cpp index 5601c23..577631c 100644 --- a/src/poisettings.cpp +++ b/src/poisettings.cpp @@ -63,7 +63,7 @@ PoiSettings::PoiSettings(QWidget* parent): QDialog(parent) QHBoxLayout* distance = new QHBoxLayout; distance->addWidget(distanceLabel_); distance->addWidget(distance_); - onlyOnRoute_ = new QCheckBox(tr("Alert only if poi is in route")); + onlyOnRoute_ = new QCheckBox(tr("Alert only if poi is on route")); onlyOnRoute_->setChecked(Settings::instance().value("alert_only_on_route", true).toBool()); ButtonBox* buttons = new ButtonBox; diff --git a/src/themescheduler.cpp b/src/themescheduler.cpp index c8f939a..086b45a 100644 --- a/src/themescheduler.cpp +++ b/src/themescheduler.cpp @@ -81,7 +81,7 @@ void ThemeScheduler::removeItem(QTime const& time) { delete items_.at(i); items_.removeAt(i); - break; + return; } } } diff --git a/src/themeschedulersettings.cpp b/src/themeschedulersettings.cpp index c545b58..7e967fe 100644 --- a/src/themeschedulersettings.cpp +++ b/src/themeschedulersettings.cpp @@ -112,8 +112,11 @@ void ThemeSchedulerSettings::addScheduledTheme() void ThemeSchedulerSettings::clearScheduler() { - ThemeScheduler::instance().clear(); - loadItems(); + if(!ThemeScheduler::instance().isEmpty()) + { + ThemeScheduler::instance().clear(); + loadItems(); + } } void ThemeSchedulerSettings::loadItems() @@ -167,11 +170,6 @@ void ThemeSchedulerSettings::loadItems() currentWidget_ = itemList_; layout_->addWidget(itemList_); } - - QApplication::processEvents(); - adjustSize(); - QApplication::processEvents(); - } void ThemeSchedulerSettings::saveSettings() -- 1.7.9.5