load buttons from the global dir if they arent found in the user dir

This commit is contained in:
Dana Jansens 2003-01-10 22:40:16 +00:00
parent 151b6d4131
commit 6c4711cbaa

View file

@ -179,6 +179,12 @@ void Style::readDatabaseMask(const std::string &rname, PixmapMask &pixmapMask,
ret = XReadBitmapFile(OBDisplay::display, root_window,
expandTilde(xbmFile).c_str(), &pixmapMask.w,
&pixmapMask.h, &pixmapMask.mask, &hx, &hy);
if (ret != BitmapSuccess) {
xbmFile = std::string(BUTTONSDIR) + "/" + s;
ret = XReadBitmapFile(OBDisplay::display, root_window,
xbmFile.c_str(), &pixmapMask.w,
&pixmapMask.h, &pixmapMask.mask, &hx, &hy);
}
} else
ret = XReadBitmapFile(OBDisplay::display, root_window,
expandTilde(s).c_str(), &pixmapMask.w,