[BT++ CVS] BT++/src LoaderManager.py,1.8,1.9 Loader.py,1.4,1.5

[<sir...@us...>]

Update of /cvsroot/btplusplus/BT++/src
In directory sc8-pr-cvs1:/tmp/cvs-serv17547/src

Modified Files:
	LoaderManager.py Loader.py 
Log Message:
- Fixed pause.
- Fixed cancel.

Index: LoaderManager.py
===================================================================
RCS file: /cvsroot/btplusplus/BT++/src/LoaderManager.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** LoaderManager.py	28 Mar 2003 12:51:07 -0000	1.8
--- LoaderManager.py	28 Mar 2003 13:38:04 -0000	1.9
***************
*** 227,231 ****
                      break
              
!                 if not loader.IsRunning() and not loader.IsFinished():
                      dwcnt = dwcnt - 1
                      loader.StartDownload()
--- 227,231 ----
                      break
              
!                 if not loader.IsRunning() and not loader.IsUserPaused() and not loader.IsFinished():
                      dwcnt = dwcnt - 1
                      loader.StartDownload()

Index: Loader.py
===================================================================
RCS file: /cvsroot/btplusplus/BT++/src/Loader.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Loader.py	28 Mar 2003 12:44:25 -0000	1.4
--- Loader.py	28 Mar 2003 13:38:05 -0000	1.5
***************
*** 42,48 ****
          self.FlagHash = Event()
          
!         self.Hashed   = false
!         self.Paused   = true
!         self.Finished = false
          
          self.FlagEnd.clear()
--- 42,49 ----
          self.FlagHash = Event()
          
!         self.Hashed    = false
!         self.Paused    = true
!         self.UserPause = false
!         self.Finished  = false
          
          self.FlagEnd.clear()
***************
*** 147,151 ****
          
          self.FlagEnd.clear()
!         self.Paused = false
          
          self.ThrDownload = Thread( target = self.Download )
--- 148,153 ----
          
          self.FlagEnd.clear()
!         self.Paused    = false
!         self.UserPause = false
          
          self.ThrDownload = Thread( target = self.Download )
***************
*** 154,158 ****
          self.OnTrivialInfo('Download started')
  
!     def PauseDownload( self ):
          if self.ThrHashing.isAlive():
              self.FlagHash.clear()
--- 156,160 ----
          self.OnTrivialInfo('Download started')
  
!     def PauseDownload( self, user = false ):
          if self.ThrHashing.isAlive():
              self.FlagHash.clear()
***************
*** 160,164 ****
              
          self.FlagEnd.set()
!         self.Paused = true
          
          self.UpdateStatus( timeEst      = -1,
--- 162,167 ----
              
          self.FlagEnd.set()
!         self.Paused    = true
!         self.UserPause = user
          
          self.UpdateStatus( timeEst      = -1,
***************
*** 180,183 ****
--- 183,189 ----
      def IsRunning(self):
          return not self.Paused
+ 
+     def IsUserPaused(self):
+         return self.UserPause
  
      def IsFinished(self):