Leahnaya/porymap
1
0
Fork 0
mirror of https://github.com/huderlem/porymap.git synced 2026-08-11 19:35:38 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix some issues with config loading

Browse Source
This commit is contained in:
GriffinR
2025-05-21 11:53:34 -04:00
parent 8e13c98c5e
commit d8e3eb6a30
10 changed files with 79 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/mainwindow.cpp
View File

@@ -730,10 +730,11 @@ bool MainWindow::openProject(QString dir, bool initial) {
porysplash->start();
porysplash->showLoadingMessage("config");
userConfig.projectDir = dir;
userConfig.load();
projectConfig.projectDir = dir;
projectConfig.load();
if (!projectConfig.load(dir) || !userConfig.load(dir)) {
showProjectOpenFailure();
porysplash->stop();
return false;
}
porysplash->showLoadingMessage("custom scripts");
Scripting::init(this);
@@ -993,13 +994,8 @@ void MainWindow::showFileWatcherWarning() {
this->fileWatcherWarning->exec();
}
QString MainWindow::getExistingDirectory(QString dir) {
return FileDialog::getExistingDirectory(this, "Open Directory", dir, QFileDialog::ShowDirsOnly);
}
void MainWindow::on_action_Open_Project_triggered()
{
QString dir = getExistingDirectory(!projectConfig.projectDir.isEmpty() ? userConfig.projectDir : ".");
void MainWindow::on_action_Open_Project_triggered() {
QString dir = FileDialog::getExistingDirectory(this, QStringLiteral("Choose Project Folder"));
if (!dir.isEmpty())
openProject(dir);
}
@@ -2996,7 +2992,7 @@ void MainWindow::reloadScriptEngine() {
Scripting::init(this);
Scripting::populateGlobalObject(this);
// Lying to the scripts here, simulating a project reload
Scripting::cb_ProjectOpened(projectConfig.projectDir);
Scripting::cb_ProjectOpened(projectConfig.projectDir());
if (this->editor) {
if (this->editor->layout)
Scripting::cb_LayoutOpened(this->editor->layout->name);