check in /usr/local/share/openbox/buttons after trying ~/.openbox/buttons

diff --git a/src/Screen.cc b/src/Screen.cc
index d6fc2d16f9d8c537ff5716c44f2252e1abde9b59..1bb0074441856a16a6f7acd2e12388a86142ae05 100644 (file)
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -2643,7 +2643,7 @@ void BScreen::toggleFocusModel(FocusModel model) {
 #ifdef    BITMAPBUTTONS
 void BScreen::readDatabaseMask(const string &rname, PixmapMask &pixmapMask,
                                const Configuration &style) {
-  string s;
+  std::string s;
   int hx, hy; //ignored
   int ret = BitmapOpenFailed; //default to failure.
   
@@ -2651,10 +2651,17 @@ void BScreen::readDatabaseMask(const string &rname, PixmapMask &pixmapMask,
   {
     if (s[0] != '/' && s[0] != '~')
     {
-      std::string xbmFile = std::string("~/.openbox/buttons/") + s;
+      std::string xbmFile;
+      xbmFile = "~/.openbox/buttons/" + s;
       ret = XReadBitmapFile(blackbox->getXDisplay(), getRootWindow(),
                             expandTilde(xbmFile).c_str(), &pixmapMask.w,
                             &pixmapMask.h, &pixmapMask.mask, &hx, &hy);
+      if (ret != BitmapSuccess) {
+        xbmFile = std::string(BUTTONSDIR) + "/" + s;
+        ret = XReadBitmapFile(blackbox->getXDisplay(), getRootWindow(),
+                              expandTilde(xbmFile).c_str(), &pixmapMask.w,
+                              &pixmapMask.h, &pixmapMask.mask, &hx, &hy);
+      }
     } else
       ret = XReadBitmapFile(blackbox->getXDisplay(), getRootWindow(),
                             expandTilde(s).c_str(), &pixmapMask.w,