From 6c0d5433c61df005ce8b4708d0f8eadc9b47f709 Mon Sep 17 00:00:00 2001
From: notify <notify-ctrl@qq.com>
Date: Tue, 20 Jun 2023 20:34:34 +0800
Subject: [PATCH] Changelog: v0.2.5

---
 CHANGELOG.md                | 6 ++++++
 CMakeLists.txt              | 2 +-
 android/AndroidManifest.xml | 4 ++--
 src/server/room.cpp         | 4 +++-
 src/server/server.cpp       | 1 +
 5 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6f5c2db9..ea54081e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 ___
 
+## v0.2.5
+
+修复了堆积如山的bug
+
+___
+
 ## v0.2.4
 
 又一周过去了
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 17d9cef1..3816bcd9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,7 @@
 
 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}\")
 
 find_package(Qt6 REQUIRED COMPONENTS
diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index bf5ef0ec..d57380b0 100644
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -3,8 +3,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
   package="org.notify.FreeKill"
   android:installLocation="preferExternal"
-  android:versionCode="204"
-  android:versionName="0.2.4">
+  android:versionCode="205"
+  android:versionName="0.2.5">
   <uses-permission android:name="android.permission.INTERNET" />
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
   <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
diff --git a/src/server/room.cpp b/src/server/room.cpp
index ec6eafc1..f6eac0ca 100644
--- a/src/server/room.cpp
+++ b/src/server/room.cpp
@@ -542,5 +542,7 @@ void Room::manuallyStart() {
 }
 
 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));
+  }
 }
diff --git a/src/server/server.cpp b/src/server/server.cpp
index 933f304d..cc32e56b 100644
--- a/src/server/server.cpp
+++ b/src/server/server.cpp
@@ -108,6 +108,7 @@ void Server::createRoom(ServerPlayer *owner, const QString &name, int capacity,
   foreach (auto t, threads) {
     if (!t->isFull()) {
       thread = t;
+      break;
     }
   }
   if (!thread && nextRoomId != 0) {