diff --git a/qml/pages/js/helpers.js b/qml/pages/js/helpers.js index 56f6bb5..7376535 100644 --- a/qml/pages/js/helpers.js +++ b/qml/pages/js/helpers.js @@ -35,7 +35,7 @@ function getListOfInnerTimers() { var timers = settingsPage.mListOfInnerTimers.length for (var i = 0; i < timers; i++) { - list.push(settingsPage.mListOfInnerTimers[i].value) + list.push(settingsPage.mListOfInnerTimers[i]) } return list; diff --git a/rpm/harbour-boxing-timer.changes b/rpm/harbour-boxing-timer.changes index f3aa7d2..639d6b9 100644 --- a/rpm/harbour-boxing-timer.changes +++ b/rpm/harbour-boxing-timer.changes @@ -8,18 +8,23 @@ # * date Author's Name version-release # - Summary of changes -* Thu Sep 07 2017 Claudio Maradonna 1.2.1 +* Fri Sep 08 2017 Claudio Maradonna 1.2.3-4 +- Fixed bug when saving multiple inner timers +- Fixed bug when change presets and rounds done > 0 +- Fixed changes file + +* Thu Sep 07 2017 Claudio Maradonna 1.2.1-3 - Fixed bug with inner timer adjust and new inner timer - Fixed link bug in about page -* Wed Sep 06 2017 Claudio Maradonna 1.1 +* Wed Sep 06 2017 Claudio Maradonna 1.1-1 - Fixed bug with preset's deleting - Fixed license in about page (cutted by html tag) -* Wed Aug 30 2017 Claudio Maradonna 1.0 +* Wed Aug 30 2017 Claudio Maradonna 1.0-1 - Now you can add inner timers for rounds - New icon - Various bug fixes -* Thu Aug 24 2017 Claudio Maradonna 0.1a +* Thu Aug 24 2017 Claudio Maradonna 0.1a-1 - Initial release diff --git a/rpm/harbour-boxing-timer.spec b/rpm/harbour-boxing-timer.spec index ee1463c..bfcb213 100644 --- a/rpm/harbour-boxing-timer.spec +++ b/rpm/harbour-boxing-timer.spec @@ -13,8 +13,8 @@ Name: harbour-boxing-timer %{!?qtc_make:%define qtc_make make} %{?qtc_builddir:%define _builddir %qtc_builddir} Summary: Boxing timer -Version: 1.2.1 -Release: 3 +Version: 1.2.3 +Release: 4 Group: Applications/Utilities License: GPLv3 URL: https://github.com/UnitooTeam/harbour-boxing-timer diff --git a/rpm/harbour-boxing-timer.yaml b/rpm/harbour-boxing-timer.yaml index d6aef2b..15073ad 100644 --- a/rpm/harbour-boxing-timer.yaml +++ b/rpm/harbour-boxing-timer.yaml @@ -1,7 +1,7 @@ Name: harbour-boxing-timer Summary: Boxing timer -Version: 1.2.1 -Release: 3 +Version: 1.2.3 +Release: 4 # The contents of the Group field should be one of the groups listed here: # http://gitorious.org/meego-developer-tools/spectacle/blobs/master/data/GROUPS Group: Applications/Utilities diff --git a/src/boxingtimer.cpp b/src/boxingtimer.cpp index 3f4553f..4af5e15 100644 --- a/src/boxingtimer.cpp +++ b/src/boxingtimer.cpp @@ -189,6 +189,7 @@ const QString BoxingTimer::roundsToString() { void BoxingTimer::loadPreset(const QString &preset) { this->settings->setPreset(preset); + this->mRound = 0; this->mRemainingMilliseconds = settings->getRoundMilliseconds(); this->mStatus = Status::Stop;