Changeset 634 for trunk

Show
Ignore:
Timestamp:
09/21/07 14:59:14 (14 months ago)
Author:
daelstorm
Message:

Fix downloadQueueTimer not getting cancelled when quitting nicotine+

Location:
trunk/nicotine+/pynicotine
Files:
3 modified

Legend:

Unmodified
Added
Removed

  • trunk/nicotine+/pynicotine/config.py

    r631 r634  
    9595"searches":{"maxresults":50,"re_filter":0,"history":[], \ 
    9696"enablefilters":0, "defilter":["","","","",0,""], "filtercc":[], \ 
    97 "filterin":[],"filterout":[],"filtersize":[],"filterbr":[], "distrib_timer": 1, "distrib_ignore": 60}, \ 
     97"filterin":[],"filterout":[],"filtersize":[],"filterbr":[], "distrib_timer": 0, "distrib_ignore": 60}, \ 
    9898\ 
    9999"ui":{"icontheme": "", "chatme":"FOREST GREEN", "chatremote":"","chatlocal":"BLUE", \ 

  • trunk/nicotine+/pynicotine/gtkgui/frame.py

    r633 r634  
    11561156                 
    11571157        def OnDestroy(self, widget): 
    1158                 if self.np.servertimer is not None: 
    1159                         self.np.servertimer.cancel() 
    1160                 if self.np.searchResultsTimer is not None: 
    1161                         self.np.searchResultsTimer.cancel() 
    1162                 if self.np.respondDistributedTimer is not None: 
    1163                         self.np.respondDistributedTimer.cancel() 
     1158                 
    11641159                self.np.StopTimers() 
    1165                 if self.np.transfers is not None: 
    1166                         self.np.transfers.AbortTransfers() 
    1167                         if self.np.transfers.uploadQueueTimer is not None: 
    1168                                 self.np.transfers.uploadQueueTimer.cancel() 
     1160                 
    11691161                 
    11701162                self.np.config.sections["privatechat"]["users"] = list(self.privatechats.users.keys()) 

  • trunk/nicotine+/pynicotine/pynicotine.py

    r628 r634  
    327327                        if i.conntimer is not None: 
    328328                                i.conntimer.cancel() 
    329  
     329                if self.servertimer is not None: 
     330                        self.servertimer.cancel() 
     331                if self.searchResultsTimer is not None: 
     332                        self.searchResultsTimer.cancel() 
     333                if self.respondDistributedTimer is not None: 
     334                        self.respondDistributedTimer.cancel() 
     335                if self.transfers is not None: 
     336                        self.transfers.AbortTransfers() 
     337                        if self.transfers.uploadQueueTimer is not None: 
     338                                self.transfers.uploadQueueTimer.cancel() 
     339                        if self.transfers.downloadQueueTimer is not None: 
     340                                self.transfers.downloadQueueTimer.cancel() 
    330341        def ConnectToServer(self, msg): 
    331342                self.frame.OnConnect(None) 
    … …  
    511522                                if self.transfers.uploadQueueTimer is not None: 
    512523                                        self.transfers.uploadQueueTimer.cancel() 
     524                                if self.transfers.downloadQueueTimer is not None: 
     525                                        self.transfers.downloadQueueTimer.cancel() 
    513526                        self.privatechat = self.chatrooms = self.userinfo = self.userbrowse = self.search = self.transfers = self.userlist = None 
    514527                        self.frame.ConnClose(conn, addr)