修复了一些问题，可能会解决vac验证问题，修复手动选择CSGO路径的问题

Purple-CSGO · Feb 4, 2020 · c99d4b8 · c99d4b8
1 parent e080a88
commit c99d4b8
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/CSGO-Toolbox.pro b/CSGO-Toolbox.pro
@@ -41,7 +41,7 @@ QMAKE_CXXFLAGS+=/execution-charset:utf-8
 
 RC_CODEPAGE = 65001
 
-VERSION = 1.0.2a
+VERSION = 1.0.2b
 
 DEFINES += APP_VERSION=\\\"$$VERSION\\\"
 

diff --git a/CSGO-Toolbox.pro.user b/CSGO-Toolbox.pro.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.11.0, 2020-02-04T13:11:37. -->
+<!-- Written by QtCreator 4.11.0, 2020-02-04T17:07:13. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>

diff --git a/mainwindow.cpp b/mainwindow.cpp
@@ -395,7 +395,8 @@ void MainWindow::on_manualBtn_clicked()
 //手动选择csgo位置
 void MainWindow::on_manualCsgoBtn_clicked()
 {
-    QString tPath = QFileDialog::getOpenFileName(this, "选择csgo.exe的位置", tPath, "csgo.exe");
+    QString tPath = "";
+     tPath = QFileDialog::getOpenFileName(this, "选择csgo.exe的位置", tPath, "csgo.exe");
     if( !isCsgoExisted(tPath) ){
         return;
     }
@@ -712,8 +713,12 @@ void MainWindow::solveVacIssue()
     //            ? start /high steam -console -cafeapplaunch -forceservice
 
     //1.
-    cmd("taskkill /F /IM Steam.exe");
-    cmd("taskkill /F /IM csgolauncher.exe");
+    cmd("taskkill /f /t /im csgo.exe");
+    cmd("taskkill /f /t /im steam.exe");
+    cmd("taskkill /f /t /im csgolauncher.exe");
+    do{
+        stall(100);
+    }while( getProcessPath("csgo.exe").endsWith("exe") || getProcessPath("steam.exe").endsWith("exe") ||getProcessPath("csgolauncher.exe").endsWith("exe") );
     //2.
     cmd("sc config Netman start= AUTO");
     cmd("sc start Netman");

diff --git a/mainwindow.ui b/mainwindow.ui
@@ -91,7 +91,7 @@
      <enum>QTabWidget::Rounded</enum>
     </property>
     <property name="currentIndex">
-     <number>0</number>
+     <number>1</number>
     </property>
     <property name="tabBarAutoHide">
      <bool>false</bool>