Fix send to menu, having deleted workspaces in it.

[chaz/openbox] / util / epist / epist.cc

diff --git a/util/epist/epist.cc b/util/epist/epist.cc
index f83059435edc458c8cd7edaf4c675cf7c3e71064..a5b829b0063bb29133aa9ceea8df067831aa2455 100644 (file)
--- a/util/epist/epist.cc
+++ b/util/epist/epist.cc
@@ -41,6 +41,16 @@ extern "C" {
 #ifdef    HAVE_LIBGEN_H
 #  include <libgen.h>
 #endif // HAVE_LIBGEN_H
+
+#ifdef    HAVE_UNISTD_H
+#  include <sys/types.h>
+#  include <unistd.h>
+#endif // HAVE_UNISTD_H
+
+#ifdef    HAVE_SYS_STAT_H
+#  include <sys/types.h>
+#  include <sys/stat.h>
+#endif // HAVE_SYS_STAT_H
 }
 
 #include <iostream>
@@ -66,7 +76,12 @@ epist::epist(char **argv, char *dpy_name, char *rc_file)
   if (rc_file)
     _rc_file = rc_file;
   else
-    _rc_file = expandTilde("~/.epistrc");
+    _rc_file = expandTilde("~/.openbox/epistrc");
+
+  struct stat buf;
+  if (0 != stat(_rc_file.c_str(), &buf) ||
+      !S_ISREG(buf.st_mode))
+    _rc_file = DEFAULTRC;
 
   _xatom = new XAtom(getXDisplay());
 
@@ -109,12 +124,16 @@ void epist::activateGrabs() {
 
 bool epist::handleSignal(int sig) {
   switch (sig) {
-  case SIGHUP:
+  case SIGHUP: {
     cout << "epist: Restarting on request.\n";
+    
     execvp(_argv[0], _argv);
+
     string base(basename(_argv[0]));
     execvp(base.c_str(), _argv);
+    
     return false;  // this should be unreachable
+  }
 
   case SIGTERM:
   case SIGINT: