From: Dana Jansens <danakj@orodu.net>
Date: Fri, 10 Jan 2003 22:42:45 +0000 (+0000)
Subject: load a global defaults.py if the user.py isnt loaded
X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=d12e655d45a3e760fa39b47ae62cbebe0ad52350;p=chaz%2Fopenbox

load a global defaults.py if the user.py isnt loaded
---

diff --git a/src/openbox.cc b/src/openbox.cc
index b44a1861..3232827f 100644
--- a/src/openbox.cc
+++ b/src/openbox.cc
@@ -139,8 +139,9 @@ Openbox::Openbox(int argc, char **argv)
   python_exec(SCRIPTDIR"/config.py"); // load openbox config values
   // run all of the python scripts
   python_exec(SCRIPTDIR"/builtins.py"); // builtin callbacks
-  // run the user's script
-  python_exec(_scriptfilepath.c_str());
+  // run the user's script or the system defaults if that fails
+  if (!python_exec(_scriptfilepath.c_str()))
+    python_exec(SCRIPTDIR"/defaults.py"); // system default bahaviors
 
   // initialize all the screens
   OBScreen *screen;