Update of /cvsroot/freevo/freevo/src
In directory sc8-pr-cvs1:/tmp/cvs-serv14276

Modified Files:
        osd.py 
Log Message:
fix crash when filename already is an image object

Index: osd.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/osd.py,v
retrieving revision 1.124
retrieving revision 1.125
diff -C2 -d -r1.124 -r1.125
*** osd.py      13 Jan 2004 19:11:19 -0000      1.124
--- osd.py      16 Jan 2004 12:19:09 -0000      1.125
***************
*** 11,14 ****
--- 11,17 ----
  # -----------------------------------------------------------------------
  # $Log$
+ # Revision 1.125  2004/01/16 12:19:09  dischi
+ # fix crash when filename already is an image object
+ #
  # Revision 1.124  2004/01/13 19:11:19  dischi
  # backup screen before osd shutdown
***************
*** 1272,1276 ****
              _debug_('Trying to load file "%s"' % filename, level=3)
  
!             if filename.endswith('.raw'):
                  data  = util.read_pickle(filename)
                  image = pygame.image.fromstring(data[0], data[1], data[2])
--- 1275,1279 ----
              _debug_('Trying to load file "%s"' % filename, level=3)
  
!             if isinstance(filename, str) and filename.endswith('.raw'):
                  data  = util.read_pickle(filename)
                  image = pygame.image.fromstring(data[0], data[1], data[2])




-------------------------------------------------------
The SF.Net email is sponsored by EclipseCon 2004
Premiere Conference on Open Tools Development and Integration
See the breadth of Eclipse activity. February 3-5 in Anaheim, CA.
http://www.eclipsecon.org/osdn
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog

Reply via email to