games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-24 22:14:36 +02:00
Code Issues Releases Activity

Fix icons path for macOS if editor started from installed package

Browse Source
This commit is contained in:
nordsoft 2022-12-20 19:11:49 +04:00 committed by Nordsoft91
parent 4674e240d8
commit 3a49bc6f8b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mapeditor/mainwindow.cpp
View File

@ -120,6 +120,10 @@ MainWindow::MainWindow(QWidget* parent) :
ui(new Ui::MainWindow), ui(new Ui::MainWindow),
controller(this) controller(this)
{ {
// Set current working dir to executable folder.
// This is important on Mac for relative paths to work inside DMG.
QDir::setCurrent(QApplication::applicationDirPath());
for(auto & string : VCMIDirs::get().dataPaths()) for(auto & string : VCMIDirs::get().dataPaths())
QDir::addSearchPath("icons", pathToQString(string / "mapeditor" / "icons")); QDir::addSearchPath("icons", pathToQString(string / "mapeditor" / "icons"));
QDir::addSearchPath("icons", pathToQString(VCMIDirs::get().userDataPath() / "mapeditor" / "icons")); QDir::addSearchPath("icons", pathToQString(VCMIDirs::get().userDataPath() / "mapeditor" / "icons"));
@ -128,10 +132,6 @@ MainWindow::MainWindow(QWidget* parent) :
loadUserSettings(); //For example window size loadUserSettings(); //For example window size
setTitle(); setTitle();
// Set current working dir to executable folder.
// This is important on Mac for relative paths to work inside DMG.
QDir::setCurrent(QApplication::applicationDirPath());
ExtractionOptions extractionOptions; ExtractionOptions extractionOptions;
parseCommandLine(extractionOptions); parseCommandLine(extractionOptions);