more flexible handling of startup XML's

2009-03-25 13:05:55 +00:00
parent df7f36de2f
commit b38e8beffc
6 changed files with 72 additions and 41 deletions
--- a/src/musrgui/PAdmin.cpp
+++ b/src/musrgui/PAdmin.cpp
@@ -235,10 +235,13 @@ PAdmin::PAdmin()
  fHelpMain   = QString("");

  // XML Parser part
-  QString path = getenv("MUSRFITPATH");
-  if (path.isEmpty())
-    path = "/home/nemu/analysis/bin";
-  QString fln = path + "/musrgui_startup.xml";
+  QString fln = "./musrgui_startup.xml";
+  if (!QFile::exists(fln)) {
+    QString path = getenv("MUSRFITPATH");
+    if (path.isEmpty())
+      path = "/home/nemu/analysis/bin";
+    fln = path + "/musrgui_startup.xml";
+  }
  if (QFile::exists(fln)) { // administration file present
    PAdminXMLParser handler(this);
    QFile xmlFile(fln);