YunFeiyang
/
FreeKill
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changelog: v0.2.5

This commit is contained in:
notify 2023-06-20 20:34:34 +08:00
parent 49e8849061
commit 6c0d5433c6
5 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG.md
View File

@ -2,6 +2,12 @@
___ ___
## v0.2.5
修复了堆积如山的bug
___
## v0.2.4 ## v0.2.4
又一周过去了 又一周过去了

2
CMakeLists.txt
View File

@ -2,7 +2,7 @@
cmake_minimum_required(VERSION 3.16) cmake_minimum_required(VERSION 3.16)
project(FreeKill VERSION 0.2.4) project(FreeKill VERSION 0.2.5)
add_definitions(-DFK_VERSION=\"${CMAKE_PROJECT_VERSION}\") add_definitions(-DFK_VERSION=\"${CMAKE_PROJECT_VERSION}\")
find_package(Qt6 REQUIRED COMPONENTS find_package(Qt6 REQUIRED COMPONENTS

4
android/AndroidManifest.xml
View File

@ -3,8 +3,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.notify.FreeKill" package="org.notify.FreeKill"
android:installLocation="preferExternal" android:installLocation="preferExternal"
android:versionCode="204" android:versionCode="205"
android:versionName="0.2.4"> android:versionName="0.2.5">
<uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />

4
src/server/room.cpp
View File

@ -542,5 +542,7 @@ void Room::manuallyStart() {
} }
void Room::pushRequest(const QString &req) { void Room::pushRequest(const QString &req) {
m_thread->pushRequest(QString("%1,%2").arg(QString::number(id), req)); if (m_thread) {
m_thread->pushRequest(QString("%1,%2").arg(QString::number(id), req));
}
} }

1
src/server/server.cpp
View File

@ -108,6 +108,7 @@ void Server::createRoom(ServerPlayer *owner, const QString &name, int capacity,
foreach (auto t, threads) { foreach (auto t, threads) {
if (!t->isFull()) { if (!t->isFull()) {
thread = t; thread = t;
break;
} }
} }
if (!thread && nextRoomId != 0) { if (!thread && nextRoomId != 0) {