Francois Gouget : testbot/Users: Disabled accounts are not waiting for approval.

[Alexandre Julliard]

Module: tools
Branch: master
Commit: b98cb3a916297bee4f33e2dd44cf58dbe9442c0b
URL:    http://source.winehq.org/git/tools.git/?a=commit;h=b98cb3a916297bee4f33e2dd4...

Author: Francois Gouget 
Date:   Wed Apr  3 16:57:39 2013 +0200

testbot/Users: Disabled accounts are not waiting for approval.

---

testbot/lib/WineTestBot/Users.pm |    8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/testbot/lib/WineTestBot/Users.pm b/testbot/lib/WineTestBot/Users.pm
index f29fd5e..cb3725b 100644
--- a/testbot/lib/WineTestBot/Users.pm
+++ b/testbot/lib/WineTestBot/Users.pm
@@ -1,4 +1,5 @@
 # Copyright 2009 Ge van Geldorp
+# Copyright 2013 Francois Gouget
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -88,12 +89,7 @@ sub WaitingForApproval
 {
   my $self = shift;

-  if ($self->Activated())
-  {
-    return !1;
-  }
-
-  return ! $self->ResetCode;
+  return $self->Active && !$self->Activated() && !$self->ResetCode;
 }

sub GenerateResetCode