diff --git a/src/musredit_qt6/musredit/PAdmin.cpp b/src/musredit_qt6/musredit/PAdmin.cpp index d7360ce2..3809672c 100644 --- a/src/musredit_qt6/musredit/PAdmin.cpp +++ b/src/musredit_qt6/musredit/PAdmin.cpp @@ -775,13 +775,13 @@ PAdmin::PAdmin() : QObject() // XML Parser part // 1st: check local directory - QString path = QString("./"); + QString path = QDir::currentPath(); QString fln = QString("musredit_startup.xml"); QString pathFln = path + fln; QProcessEnvironment procEnv = QProcessEnvironment::systemEnvironment(); if (!QFile::exists(pathFln)) { // 2nd: check $HOME/.musrfit/musredit/musredit_startup.xml - path = procEnv.value("HOME", ""); + path = QDir::homePath(); pathFln = path + "/.musrfit/musredit/" + fln; if (!QFile::exists(pathFln)) { // 3rd: check $MUSRFITPATH/musredit_startup.xml @@ -833,15 +833,6 @@ PAdmin::PAdmin() : QObject() } } -//-------------------------------------------------------------------------- -/** - *

Destructor - */ -PAdmin::~PAdmin() -{ - saveRecentFiles(); -} - //-------------------------------------------------------------------------- /** *

returns the help url corresponding the the tag. @@ -1096,7 +1087,7 @@ void PAdmin::saveRecentFiles() QString fln = QString("./musredit_startup.xml"); if (!QFile::exists(fln)) fln = fPrefPathName; - + if (QFile::exists(fln)) { // administration file present QVector data; QFile file(fln); diff --git a/src/musredit_qt6/musredit/PAdmin.h b/src/musredit_qt6/musredit/PAdmin.h index e80d1f71..920f8f8d 100644 --- a/src/musredit_qt6/musredit/PAdmin.h +++ b/src/musredit_qt6/musredit/PAdmin.h @@ -65,7 +65,6 @@ class PAdminXMLParser { public: PAdminXMLParser(const QString &fln, PAdmin*); - virtual ~PAdminXMLParser() {} virtual bool isValid() { return fValid; } @@ -113,7 +112,6 @@ class PAdmin : public QObject { public: PAdmin(); - virtual ~PAdmin(); int getTimeout() { return fTimeout; } QString getFontName() { return fFontName; } @@ -173,6 +171,7 @@ class PAdmin : public QObject int loadPrefs(QString fln); int savePrefs(QString pref_fln); + void saveRecentFiles(); ///< save recent file list protected: void setExecPath(const QString str) { fExecPath = str; } @@ -228,7 +227,6 @@ class PAdmin : public QObject QVector fTheory; ///< stores all known theories. Needed when generating theory blocks from within musredit. - void saveRecentFiles(); ///< save recent file list void createMusreditStartupFile(); ///< create default musredit_startup.xml }; diff --git a/src/musredit_qt6/musredit/PTextEdit.cpp b/src/musredit_qt6/musredit/PTextEdit.cpp index 3adb8cd1..4842db73 100644 --- a/src/musredit_qt6/musredit/PTextEdit.cpp +++ b/src/musredit_qt6/musredit/PTextEdit.cpp @@ -1673,6 +1673,8 @@ void PTextEdit::fileExit() } } + fAdmin->saveRecentFiles(); + qApp->quit(); }