1. fix handler remove bug

feekia · feekia · commit cba767226c21 · 2022-02-21T21:54:33.000+08:00
diff --git a/examples/handler_tutorial.cc b/examples/handler_tutorial.cc
@@ -28,8 +28,10 @@ int main(int argc, char **argv) {
 
     hdlr.postDelay([]() { cout << "POST call back" << endl; }, 230);
 
-
-    std::this_thread::sleep_until(std::chrono::steady_clock::now() + std::chrono::seconds(12));
+    std::this_thread::sleep_until(std::chrono::steady_clock::now() + std::chrono::seconds(3));
+    hdlr.removeMessages(6);
+    std::this_thread::sleep_until(std::chrono::steady_clock::now() + std::chrono::seconds(1));
+    hdlr.removeAlls();
     // hdlr.stop();
     cout << "Program exit !" << endl;
     return 1;
diff --git a/handler/handler.cc b/handler/handler.cc
@@ -59,7 +59,6 @@ bool Handler::sendEmptyMessageDelay(int what, long delayMillis) {
 
 bool Handler::post(std::function<void()> &&f) { return postDelay(std::move(f), 0); }
 bool Handler::postDelay(std::function<void()> &&f, long delayMillis) {
-
     if (f == nullptr || delayMillis < 0) {
         return false;
     }
@@ -76,12 +75,12 @@ void Handler::removeMessages(int what) {
     if (what < 0) return;
 
     std::unique_lock<std::mutex> lock(queue_mutex);
-    msg_list.remove_if([what](const Message &m) { return m.what == what; });
+    if (!msg_list.empty()) msg_list.remove_if([what](const Message &m) { return m.what == what; });
 }
 
 void Handler::removeAlls() {
     std::unique_lock<std::mutex> lock(queue_mutex);
-    msg_list.clear();
+    if (!msg_list.empty()) msg_list.clear();
 }
 
 void Handler::stop() {

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,6 @@ bool Handler::sendEmptyMessageDelay(int what, long delayMillis) {`
`59`	`59`
`60`	`60`	`bool Handler::post(std::function<void()> &&f) { return postDelay(std::move(f), 0); }`
`61`	`61`	`bool Handler::postDelay(std::function<void()> &&f, long delayMillis) {`
`62`		`-`
`63`	`62`	`if (f == nullptr \|\| delayMillis < 0) {`
`64`	`63`	`return false;`
`65`	`64`	`}`
`@@ -76,12 +75,12 @@ void Handler::removeMessages(int what) {`
`76`	`75`	`if (what < 0) return;`
`77`	`76`
`78`	`77`	`std::unique_lock<std::mutex> lock(queue_mutex);`
`79`		`- msg_list.remove_if([what](const Message &m) { return m.what == what; });`
	`78`	`+ if (!msg_list.empty()) msg_list.remove_if([what](const Message &m) { return m.what == what; });`
`80`	`79`	`}`
`81`	`80`
`82`	`81`	`void Handler::removeAlls() {`
`83`	`82`	`std::unique_lock<std::mutex> lock(queue_mutex);`
`84`		`- msg_list.clear();`
	`83`	`+ if (!msg_list.empty()) msg_list.clear();`
`85`	`84`	`}`
`86`	`85`
`87`	`86`	`void Handler::stop() {`