|
@@ -167,15 +167,13 @@ void LotroManager::on_dat_operation_finished(QString command, QString, QString n
|
|
|
}
|
|
|
|
|
|
void LotroManager::saveDatFiles() {
|
|
|
- for (auto dat_file : dat_files_)
|
|
|
+ for (auto &dat_file : dat_files_)
|
|
|
dat_file.CloseDatFile();
|
|
|
}
|
|
|
|
|
|
bool LotroManager::startGame(){
|
|
|
App *app = &App::getInstance();
|
|
|
-
|
|
|
- for (auto &dat_file : dat_files_)
|
|
|
- dat_file.CloseDatFile();
|
|
|
+ saveDatFiles();
|
|
|
|
|
|
QStringList args;
|
|
|
args << "-skiprawdownload" << "-nosplash";
|
|
@@ -186,10 +184,12 @@ bool LotroManager::startGame(){
|
|
|
if(FileSystem::fileExists(QApplication::applicationDirPath() + "/user.ini")){
|
|
|
QSettings login(QApplication::applicationDirPath() + "/user.ini", QSettings::IniFormat );
|
|
|
login.beginGroup("Account");
|
|
|
- QString username = login.value("username", "").toString();
|
|
|
- QString password = login.value("password", "").toString();
|
|
|
+ QString username = login.value("username", "none").toString();
|
|
|
+ QString password = login.value("password", "none").toString();
|
|
|
login.endGroup();
|
|
|
- args << "-username" << username << "-password" << password;
|
|
|
+ qDebug() << "Reading user.ini data: " << username << " " << password;
|
|
|
+ if (username != "none" && password != "none")
|
|
|
+ args << "-username" << username << "-password" << password;
|
|
|
}
|
|
|
|
|
|
qDebug() << "Запускаем игру со следующими аргументами: " << args;
|