diff --git a/.ci/gta5view.nsi b/.ci/gta5view.nsi index 0d94825..3630b69 100644 --- a/.ci/gta5view.nsi +++ b/.ci/gta5view.nsi @@ -3,7 +3,7 @@ !define APP_NAME "gta5view" !define COMP_NAME "Syping" !define WEB_SITE "https://gta5view.syping.de/" -!define VERSION "1.6.0.0" +!define VERSION "1.6.1.0" !define COPYRIGHT "Copyright © 2016-2018 Syping" !define DESCRIPTION "Grand Theft Auto V Savegame and Snapmatic Viewer/Editor" !define INSTALLER_NAME "gta5view_setup.exe" diff --git a/DatabaseThread.cpp b/DatabaseThread.cpp index 47160e0..498ad90 100644 --- a/DatabaseThread.cpp +++ b/DatabaseThread.cpp @@ -44,79 +44,10 @@ void DatabaseThread::run() { QEventLoop threadLoop; - QStringList crewList; - QStringList crewListR; - - // Register thread loop end signal QObject::connect(this, SIGNAL(threadTerminated()), &threadLoop, SLOT(quit())); - // Setup crewList for Quick time scan - crewList = crewDB->getCrews(); - if (!crewList.isEmpty()) - { - crewListR = deleteCompatibleCrews(crewList); - } - else - { - while (crewList.isEmpty() && threadRunning) - { - QTimer::singleShot(1000, &threadLoop, SLOT(quit())); - threadLoop.exec(); - if (!crewDB->isAddingCrews()) - { - crewList = crewDB->getCrews(); - } - } - if (threadRunning) - { - crewListR = deleteCompatibleCrews(crewList); - } - } - - // Only do QTS when Thread should be run - if (threadRunning) - { - // Quick time scan -#ifdef GTA5SYNC_DEBUG - qDebug() << "Start QTS"; -#endif - if (crewListR.length() <= 5) - { - scanCrewReference(crewListR, 2500); - emit crewNameUpdated(); - } - if (crewList.length() <= 3) - { - scanCrewMembersList(crewList, 3, 2500); - emit playerNameUpdated(); - } - else if (crewList.length() <= 5) - { - scanCrewMembersList(crewList, 2, 2500); - emit playerNameUpdated(); - } - - if (threadRunning) - { - QTimer::singleShot(10000, &threadLoop, SLOT(quit())); - threadLoop.exec(); - } - } - while (threadRunning) { - crewList = crewDB->getCrews(); - crewListR = deleteCompatibleCrews(crewList); - - // Long time scan -#ifdef GTA5SYNC_DEBUG - qDebug() << "Start LTS"; -#endif - scanCrewReference(crewListR, 10000); - emit crewNameUpdated(); - scanCrewMembersList(crewList, crewMaxPages, 10000); - emit playerNameUpdated(); - if (threadRunning) { QTimer::singleShot(300000, &threadLoop, SLOT(quit())); diff --git a/config.h b/config.h index ca74c4b..c9a2af8 100644 --- a/config.h +++ b/config.h @@ -44,7 +44,7 @@ #endif #ifndef GTA5SYNC_APPVER -#define GTA5SYNC_APPVER "1.6.0" +#define GTA5SYNC_APPVER "1.6.1" #endif #if __cplusplus diff --git a/res/app.rc b/res/app.rc index 6169798..e9744a4 100644 --- a/res/app.rc +++ b/res/app.rc @@ -7,8 +7,8 @@ CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "gta5view.exe.manifest" #include VS_VERSION_INFO VERSIONINFO -FILEVERSION 1, 6, 0, 0 -PRODUCTVERSION 1, 6, 0, 0 +FILEVERSION 1, 6, 1, 0 +PRODUCTVERSION 1, 6, 1, 0 FILEFLAGSMASK 0x3fL FILEFLAGS 0 FILEOS VOS_NT_WINDOWS32 @@ -25,12 +25,12 @@ BEGIN BEGIN VALUE "CompanyName", "Syping" VALUE "FileDescription", "gta5view" - VALUE "FileVersion", "1.6.0" + VALUE "FileVersion", "1.6.1" VALUE "InternalName", "gta5view" VALUE "LegalCopyright", "Copyright © 2016-2018 Syping" VALUE "OriginalFilename", "gta5view.exe" VALUE "ProductName", "gta5view" - VALUE "ProductVersion", "1.6.0" + VALUE "ProductVersion", "1.6.1" END END END