aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick J Cherry <patrick@bytemark.co.uk>2011-07-19 18:01:35 +0100
committerPatrick J Cherry <patrick@bytemark.co.uk>2011-07-19 18:01:35 +0100
commit3f12892f1f4555f10c496bbfd059639b799d6512 (patch)
tree732da3b983d1580e90b7b1e8c9571c155db336b7
parenteadb2e10670093ebd754d5041d8cce17bca10d4d (diff)
Added extra flag to frozen? check.
-rw-r--r--debian/changelog6
-rw-r--r--lib/mauve/mauve_thread.rb2
2 files changed, 7 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index ce62c76..79e739f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mauvealert (3.1.3) stable; urgency=low
+
+ * Tidied up initscript
+
+ -- Patrick J Cherry <patrick@bytemark.co.uk> Tue, 19 Jul 2011 17:59:01 +0100
+
mauvealert (3.1.2) stable; urgency=low
* Fixed up some gruesome spelling errors.
diff --git a/lib/mauve/mauve_thread.rb b/lib/mauve/mauve_thread.rb
index ca537da..e635155 100644
--- a/lib/mauve/mauve_thread.rb
+++ b/lib/mauve/mauve_thread.rb
@@ -62,7 +62,7 @@ module Mauve
end
def frozen?
- self.alive? and self.stop?
+ self.alive? and self.stop? and @frozen
end
def thaw