copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

catch WinAPI LoadImage exception and do not set new image when raised (hey at least we do not fail :P)

This commit is contained in:
Nikos Kouremenos 2006-01-14 12:56:38 +00:00
parent f8652420e7
commit 528871d72c
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/systraywin32.py
View File

@ -310,6 +310,8 @@ class SystrayWin32(systray.Systray):
else: else:
state = self.status state = self.status
hicon = self.tray_ico_imgs[state] hicon = self.tray_ico_imgs[state]
if hicon is None:
return
self.systray_winapi.add_notify_icon(self.systray_context_menu, hicon, self.systray_winapi.add_notify_icon(self.systray_context_menu, hicon,
'Gajim') 'Gajim')
@ -336,8 +338,12 @@ class SystrayWin32(systray.Systray):
if os.path.exists(path_to_ico): if os.path.exists(path_to_ico):
hinst = win32gui.GetModuleHandle(None) hinst = win32gui.GetModuleHandle(None)
img_flags = win32con.LR_LOADFROMFILE | win32con.LR_DEFAULTSIZE img_flags = win32con.LR_LOADFROMFILE | win32con.LR_DEFAULTSIZE
image = win32gui.LoadImage(hinst, path_to_ico, win32con.IMAGE_ICON, try:
0, 0, img_flags) image = win32gui.LoadImage(hinst, path_to_ico,
imgs[state] = image win32con.IMAGE_ICON, 0, 0, img_flags)
except pywintypes.error:
imgs[state] = None
else:
imgs[state] = image
return imgs return imgs