Merge branch 'draceo-pypad_fix' into qt5

This commit is contained in:
Fred Gleason 2022-12-23 10:49:20 -05:00
commit a9653327a7
3 changed files with 7 additions and 3 deletions

View File

@ -54,3 +54,5 @@ Chris Smowton
Scott Spillers <scotts@paravelsystems.com>
The original Icon set
Florent Peyraud <florent@draceo.fr>
Pypad fix

View File

@ -23849,3 +23849,5 @@
2022-12-22 Fred Gleason <fredg@paravelsystems.com>
* Documented the '--check-log-line-ids' option in the rddbmgr(8)
man page.
2022-12-23 Florent Peyraud <florent@draceo.fr>
* Fix pypad lib which crashed when ProcessNullUpdates!=0 in conffile

View File

@ -725,11 +725,11 @@ class Update(object):
if self.__config.get(section,'ProcessNullUpdates')=='0':
result=result and True
if self.__config.get(section,'ProcessNullUpdates')=='1':
result=result and self.hasPadType(pypad.TYPE_NOW)
result=result and self.hasPadType(TYPE_NOW)
if self.__config.get(section,'ProcessNullUpdates')=='2':
result=result and self.hasPadType(pypad.TYPE_NEXT)
result=result and self.hasPadType(TYPE_NEXT)
if self.__config.get(section,'ProcessNullUpdates')=='3':
result=result and self.hasPadType(pypad.TYPE_NOW) and self.hasPadType(pypad.TYPE_NEXT)
result=result and self.hasPadType(TYPE_NOW) and self.hasPadType(TYPE_NEXT)
else:
result=result and True