mirror of
https://github.com/vcmi/vcmi.git
synced 2025-11-25 22:42:04 +02:00
get rid of CLauncherDirs global static
std::call_once causes crash
This commit is contained in:
@@ -10,11 +10,13 @@
|
||||
#include "StdInc.h"
|
||||
#include "main.h"
|
||||
#include "mainwindow_moc.h"
|
||||
#include "launcherdirs.h"
|
||||
|
||||
#include "../lib/VCMIDirs.h"
|
||||
|
||||
#include <QApplication>
|
||||
#include <QProcess>
|
||||
#include <QMessageBox>
|
||||
#include "../lib/VCMIDirs.h"
|
||||
|
||||
// Conan workaround https://github.com/conan-io/conan-center-index/issues/13332
|
||||
#ifdef VCMI_IOS
|
||||
@@ -33,8 +35,11 @@ int main(int argc, char * argv[])
|
||||
#endif
|
||||
QApplication vcmilauncher(argc, argv);
|
||||
|
||||
CLauncherDirs::prepare();
|
||||
|
||||
MainWindow mainWindow;
|
||||
mainWindow.show();
|
||||
|
||||
result = vcmilauncher.exec();
|
||||
#ifdef VCMI_IOS
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user