浏览代码

Ver. 1.2.3 Hotfix

Ivan Arkhipov 7 年之前
父节点
当前提交
ecb6637a59
共有 3 个文件被更改,包括 9 次插入9 次删除
  1. 7 7
      lotromanager.cpp
  2. 1 1
      mainwindow.ui
  3. 1 1
      ui_mainwindow.h

+ 7 - 7
lotromanager.cpp

@@ -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;

+ 1 - 1
mainwindow.ui

@@ -1761,7 +1761,7 @@
      </rect>
     </property>
     <property name="text">
-     <string>Наследие: v1.2.2</string>
+     <string>Наследие: v1.2.3</string>
     </property>
    </widget>
    <widget class="QPushButton" name="designButton">

+ 1 - 1
ui_mainwindow.h

@@ -740,7 +740,7 @@ public:
         goTitle->setText(QApplication::translate("MainWindow", "\320\222\320\276 \321\207\321\202\320\276 \320\261\321\203\320\264\320\265\320\274 \320\270\320\263\321\200\320\260\321\202\321\214 \321\201\320\265\320\263\320\276\320\264\320\275\321\217?", Q_NULLPTR));
         goHeader->setText(QApplication::translate("MainWindow", "\320\227\320\260\320\277\321\203\321\201\320\272 \320\270\320\263\321\200\321\213", Q_NULLPTR));
         goHint->setText(QApplication::translate("MainWindow", "\320\237\320\276\320\264\320\263\320\276\321\202\320\276\320\262\320\272\320\260 \321\204\320\260\320\271\320\273\320\276\320\262 \320\273\320\276\320\272\320\260\320\273\320\270\320\267\320\260\321\206\320\270\320\270 ...", Q_NULLPTR));
-        labelVersion->setText(QApplication::translate("MainWindow", "\320\235\320\260\321\201\320\273\320\265\320\264\320\270\320\265: v1.2.2", Q_NULLPTR));
+        labelVersion->setText(QApplication::translate("MainWindow", "\320\235\320\260\321\201\320\273\320\265\320\264\320\270\320\265: v1.2.3", Q_NULLPTR));
         designButton->setText(QApplication::translate("MainWindow", "\320\236\320\261\320\275\320\276\320\262\320\270\321\202\321\214", Q_NULLPTR));
         mainTitle->setText(QApplication::translate("MainWindow", "\320\222\320\273\320\260\321\201\321\202\320\265\320\273\320\270\320\275 \320\272\320\276\320\273\320\265\321\206 \320\236\320\275\320\273\320\260\320\271\320\275: \320\235\320\260\321\201\320\273\320\265\320\264\320\270\320\265", Q_NULLPTR));
     } // retranslateUi