Avoid uninitialized var

Found by coverity
Merge branch 'atronix' into coverity_scan