[Lmuse-cvs-traffic] muse/muse conf.cpp,1.33.2.1,1.33.2.2

[Robert J. <spa...@us...>]

Update of /cvsroot/lmuse/muse/muse
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27290

Modified Files:
      Tag: REL07
	conf.cpp 
Log Message:
fixed bg pixmap loading

Index: conf.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/conf.cpp,v
retrieving revision 1.33.2.1
retrieving revision 1.33.2.2
diff -C2 -d -r1.33.2.1 -r1.33.2.2
*** conf.cpp	11 May 2005 18:09:02 -0000	1.33.2.1
--- conf.cpp	1 Jul 2005 21:12:54 -0000	1.33.2.2
***************
*** 484,488 ****
                                config.canvasShowGrid = xml.parseInt();
                          else if (tag == "canvasBgPixmap")
!                               config.canvasBgPixmap = xml.parseInt();
                          else if (tag == "geometryMain")
                                config.geometryMain = readGeometry(xml, tag);
--- 484,488 ----
                                config.canvasShowGrid = xml.parseInt();
                          else if (tag == "canvasBgPixmap")
!                               config.canvasBgPixmap = xml.parse1();
                          else if (tag == "geometryMain")
                                config.geometryMain = readGeometry(xml, tag);