Merge branch 'sticky2'

[kitchenalert] / src / timer.cpp

diff --git a/src/timer.cpp b/src/timer.cpp
index 8174177..df73464 100644 (file)
--- a/src/timer.cpp
+++ b/src/timer.cpp
@@ -39,6 +39,8 @@ Timer::Timer(QObject *parent) :
     connect(&_actualTimer, SIGNAL(timeout()), this, SLOT(secondPassed()));
 
     alerting_ = false;
+
+    _remainingTime = 0; //Same as when stopped
 }
 
 
@@ -211,9 +213,9 @@ bool Timer::load(QString filename)
     return true;
 }
 
-QString Timer::getFilename()
+bool Timer::isRunning()
 {
-    return filenameWithPath_;
+    return _actualTimer.isActive();
 }